merged

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index 9a51eff88e1..c432ac5a16c 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -348,7 +348,7 @@ static void _ftb_init_index_search(FT_INFO *ftb)
           FTB_EXPR *top_ftbe=ftbe->up->up;
           ftbw->docid[0]=HA_OFFSET_ERROR;
           for (ftbe=ftbw->up; ftbe != top_ftbe; ftbe=ftbe->up)
-            if (ftbe->flags & FTB_FLAG_YES)
+            if (!(ftbe->flags & FTB_FLAG_NO))
               ftbe->yweaks++;
           ftbe=0;
           break;
@@ -356,7 +356,7 @@ static void _ftb_init_index_search(FT_INFO *ftb)
       }
       if (!ftbe)
         continue;
-      /* 3 */
+      /* 4 */
       if (!is_tree_inited(& ftb->no_dupes))
         init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t),
             _ftb_no_dupes_cmp,0,0,0);