svnno****@sourc*****
svnno****@sourc*****
2007年 10月 10日 (水) 13:38:22 JST
Revision: 28
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=28
Author: mir
Date: 2007-10-10 13:38:22 +0900 (Wed, 10 Oct 2007)
Log Message:
-----------
bugfix for make error if --with-debug is configured.
Modified Paths:
--------------
mysql-5.0.45-tritonn-1.0.7/myisam/ft_update.c
mysql-5.0.45-tritonn-1.0.7/sql/sql_show.cc
Modified: mysql-5.0.45-tritonn-1.0.7/myisam/ft_update.c
===================================================================
--- mysql-5.0.45-tritonn-1.0.7/myisam/ft_update.c 2007-10-10 03:40:55 UTC (rev 27)
+++ mysql-5.0.45-tritonn-1.0.7/myisam/ft_update.c 2007-10-10 04:38:22 UTC (rev 28)
@@ -509,6 +509,7 @@
void ft_sen_index_truncate(MI_INFO *info)
{
char buf[FN_REFLEN];
+ DBUG_ENTER("ft_sen_index_truncate");
MYISAM_SHARE *share= info->s;
uint i, keys= (uint) share->state.header.keys;
for (i=0 ; i < keys ; i++)
@@ -528,7 +529,7 @@
if (!(share->keyinfo[i].senna_encoding >= 0 && share->keyinfo[i].senna_encoding <= 6))
{
share->keyinfo[i].senna = NULL;
- DBUG_RETURN(-1);
+ DBUG_VOID_RETURN;
} else {
share->keyinfo[i].senna = sen_index_create(buf, sizeof(my_off_t),
share->keyinfo[i].senna_flags,
@@ -538,5 +539,6 @@
}
}
}
+ DBUG_VOID_RETURN;
}
#endif /* ENABLE_SENNA */
Modified: mysql-5.0.45-tritonn-1.0.7/sql/sql_show.cc
===================================================================
--- mysql-5.0.45-tritonn-1.0.7/sql/sql_show.cc 2007-10-10 03:40:55 UTC (rev 27)
+++ mysql-5.0.45-tritonn-1.0.7/sql/sql_show.cc 2007-10-10 04:38:22 UTC (rev 28)
@@ -4450,6 +4450,7 @@
List<Item> field_list;
char path[FN_LEN];
char *file_name;
+ DBUG_ENTER("senna_show_status");
Protocol* protocol = thd->protocol;
char *db = lex->select_lex.db ? lex->select_lex.db : thd->db;
if (!db) {
@@ -4458,7 +4459,6 @@
}
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);