(修正)MySQLのTritonn適用済みtarballが--with-debugだとビルドできない件
http://d.hatena.ne.jp/nazone/20070928/p1の続き
元がvoidの関数なんだからDBUG_VOID_RETURNのほうがいいんじゃね?的修正。あとついでに1.0.6にしました。
diff -cr mysql-5.0.45-tritonn-1.0.6/myisam/ft_update.c mysql-5.0.45-tritonn-1.0.6-2/myisam/ft_update.c *** mysql-5.0.45-tritonn-1.0.6/myisam/ft_update.c 2007-09-29 02:20:01.000000000 +0900 --- mysql-5.0.45-tritonn-1.0.6-2/myisam/ft_update.c 2007-10-03 17:54:41.000000000 +0900 *************** *** 511,516 **** --- 511,519 ---- char buf[FN_REFLEN]; MYISAM_SHARE *share= info->s; uint i, keys= (uint) share->state.header.keys; + + DBUG_ENTER("ft_sen_index_truncate"); + for (i=0 ; i < keys ; i++) { if (share->keyinfo[i].flag & HA_FULLTEXT) *************** *** 528,534 **** if (!(share->keyinfo[i].senna_encoding >= 0 && share->keyinfo[i].senna_encoding <= 6)) { share->keyinfo[i].senna = NULL; ! DBUG_RETURN(-1); } else { share->keyinfo[i].senna = sen_index_create(buf, sizeof(my_off_t), share->keyinfo[i].senna_flags, --- 531,537 ---- if (!(share->keyinfo[i].senna_encoding >= 0 && share->keyinfo[i].senna_encoding <= 6)) { share->keyinfo[i].senna = NULL; ! DBUG_VOID_RETURN; } else { share->keyinfo[i].senna = sen_index_create(buf, sizeof(my_off_t), share->keyinfo[i].senna_flags, *************** *** 538,542 **** --- 541,547 ---- } } } + + DBUG_VOID_RETURN; } #endif /* ENABLE_SENNA */ diff -cr mysql-5.0.45-tritonn-1.0.6/sql/sql_show.cc mysql-5.0.45-tritonn-1.0.6-2/sql/sql_show.cc *** mysql-5.0.45-tritonn-1.0.6/sql/sql_show.cc 2007-09-29 02:20:06.000000000 +0900 --- mysql-5.0.45-tritonn-1.0.6-2/sql/sql_show.cc 2007-10-03 17:13:36.000000000 +0900 *************** *** 4452,4464 **** char *file_name; Protocol* protocol = thd->protocol; char *db = lex->select_lex.db ? lex->select_lex.db : thd->db; if (!db) { my_error(ER_NO_DB_ERROR, MYF(0)); DBUG_RETURN(TRUE); } ! const char *wild = lex->wild ? lex->wild->ptr() : "%"; - DBUG_ENTER("senna_show_status"); (void) my_snprintf(path, FN_LEN, "%s/%s", mysql_data_home, db); (void) unpack_dirname(path, path); --- 4452,4466 ---- char *file_name; Protocol* protocol = thd->protocol; char *db = lex->select_lex.db ? lex->select_lex.db : thd->db; + + DBUG_ENTER("senna_show_status"); + if (!db) { my_error(ER_NO_DB_ERROR, MYF(0)); DBUG_RETURN(TRUE); } ! const char *wild = lex->wild ? lex->wild->ptr() : "%"; (void) my_snprintf(path, FN_LEN, "%s/%s", mysql_data_home, db); (void) unpack_dirname(path, path);