merged

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
  the file is deleted anyway
include/my_global.h:
  merder
myisam/ft_boolean_search.c:
  huh?
mysql-test/r/fulltext.result:
  use local
mysql-test/r/fulltext_cache.result:
  ur
mysql-test/r/fulltext_left_join.result:
  ur
mysql-test/r/fulltext_multi.result:
  ur
mysql-test/r/fulltext_order_by.result:
  ur

1 files changed, 2 insertions, 0 deletions

diff --git a/mysql-test/t/check.test b/mysql-test/t/check.test
index 6296b31d65d..421c98d79e0 100644
--- a/mysql-test/t/check.test
+++ b/mysql-test/t/check.test
@@ -5,11 +5,13 @@ drop table if exists t1;
 #add a lot of keys to slow down check
 create table t1(n int not null, key(n), key(n), key(n), key(n));
 let $1=10000;
+disable_query_log;
 while ($1)
 {
  eval insert into t1 values ($1);
  dec $1;
 }
+enable_query_log;
 send check table t1 type=extended;
 connection con2;
 insert into t1 values (200000);