svnno****@sourc*****
svnno****@sourc*****
2007年 10月 19日 (金) 14:07:04 JST
Revision: 29
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=29
Author: mir
Date: 2007-10-19 14:07:04 +0900 (Fri, 19 Oct 2007)
Log Message:
-----------
additional 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/myisam/mi_delete_all.c
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 04:38:22 UTC (rev 28)
+++ mysql-5.0.45-tritonn-1.0.7/myisam/ft_update.c 2007-10-19 05:07:04 UTC (rev 29)
@@ -204,6 +204,7 @@
#define SECTIONALIZE 0x00080000
int ft_sen_index_add(MI_INFO *info, uint keynr, const byte *record, my_off_t pos)
{
+ DBUG_ENTER("ft_sen_index_add");
if (info->s->keyinfo[keynr].senna_flags & SECTIONALIZE) {
FT_SEG_ITERATOR ftsi;
unsigned int section;
@@ -230,7 +231,7 @@
sen_values_close(values);
}
}
- return 0;
+ DBUG_RETURN(0);
} else {
FT_SEG_ITERATOR ftsi;
char *buf, *p;
@@ -258,7 +259,7 @@
info->s->keyinfo[keynr].senna, &pos, (uint) pos, NULL, 0, buf, (p - buf));
sen_index_upd(info->s->keyinfo[keynr].senna, &pos, NULL, 0, buf, (p - buf));
free(buf);
- return 0;
+ DBUG_RETURN(0);
}
}
@@ -509,9 +510,9 @@
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;
+ DBUG_ENTER("ft_sen_index_truncate");
for (i=0 ; i < keys ; i++)
{
if (share->keyinfo[i].flag & HA_FULLTEXT)
Modified: mysql-5.0.45-tritonn-1.0.7/myisam/mi_delete_all.c
===================================================================
--- mysql-5.0.45-tritonn-1.0.7/myisam/mi_delete_all.c 2007-10-10 04:38:22 UTC (rev 28)
+++ mysql-5.0.45-tritonn-1.0.7/myisam/mi_delete_all.c 2007-10-19 05:07:04 UTC (rev 29)
@@ -39,13 +39,12 @@
sen_index *senna = share->keyinfo[i].senna;
if (senna)
{
+ char buf[FN_REFLEN];
if (!(share->keyinfo[i].senna_encoding >= 0 && share->keyinfo[i].senna_encoding <= 6))
{
my_errno= HA_WRONG_CREATE_OPTION;
goto err;
}
-
- char buf[FN_REFLEN];
SEN_LOG(sen_log_debug, "mi_delete_all_rows => sen_index_path: index=%p, buf=%s", senna, buf);
sen_index_path(senna, buf, FN_REFLEN);
SEN_LOG(sen_log_notice, "mi_delete_all_rows => sen_index_close: index=%p", senna);