[Tritonn-commit 81] [svn] [91] Fixed a 2ind bug: senna_flags in myisam.

Zurück zum Archiv-Index

svnno****@sourc***** svnno****@sourc*****
2008年 1月 28日 (月) 14:17:05 JST


Revision: 91
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=tritonn&view=rev&rev=91
Author:   mir
Date:     2008-01-28 14:17:05 +0900 (Mon, 28 Jan 2008)

Log Message:
-----------
Fixed a 2ind bug: senna_flags in myisam.

Modified Paths:
--------------
    tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_boolean_search.c
    tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_nlq_search.c

Modified: tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_boolean_search.c
===================================================================
--- tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_boolean_search.c	2008-01-28 04:57:39 UTC (rev 90)
+++ tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_boolean_search.c	2008-01-28 05:17:05 UTC (rev 91)
@@ -611,10 +611,11 @@
     while (ftb->sir && sen_records_next(ftb->sir, &pos, sizeof(my_off_t), NULL)) {
       info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
       info->lastpos=pos;
-      if (!(my_thread_var->sen_flags & (SENNA_USE_2IND | SENNA_IF_READ_RECORD | 
-					SENNA_FILESORT))) {
-	SEN_LOG(sen_log_dump, "ft_boolean_read_next: 2ind return 0");
-	return 0;
+      if (my_thread_var->sen_flags & SENNA_USE_2IND) {
+	if (!(my_thread_var->sen_flags & (SENNA_IF_READ_RECORD | SENNA_FILESORT))) {
+	  SEN_LOG(sen_log_debug, "ft_boolean_read_next: 2ind return 0");
+	  return 0;
+	}
       }
       if (!(*info->read_record)(info,info->lastpos,record)) {
         info->update|= HA_STATE_AKTIV;          /* Record is read */

Modified: tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_nlq_search.c
===================================================================
--- tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_nlq_search.c	2008-01-28 04:57:39 UTC (rev 90)
+++ tags/tritonn-1.0.9-mysql-5.0.51/myisam/ft_nlq_search.c	2008-01-28 05:17:05 UTC (rev 91)
@@ -323,10 +323,11 @@
     while (sen_records_next(handler->sir, &pos, sizeof(my_off_t), NULL))
     {
       info->lastpos=pos;
-      if (!(my_thread_var->sen_flags & (SENNA_USE_2IND | SENNA_IF_READ_RECORD |
-					SENNA_FILESORT))) {
-	SEN_LOG(sen_log_dump, "ft_nlq_read_next => 2ind return 0");
-	return 0;
+      if (my_thread_var->sen_flags & SENNA_USE_2IND) {
+	if (!(my_thread_var->sen_flags & (SENNA_IF_READ_RECORD | SENNA_FILESORT))) {
+	  SEN_LOG(sen_log_debug, "ft_nlq_read_next => 2ind return 0");
+	  return 0;
+	}
       }
       if (!(*info->read_record)(info,info->lastpos,record))
       {




Tritonn-commit メーリングリストの案内
Zurück zum Archiv-Index