Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-root


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok

@@ -53,6 +53,8 @@ jcole@sarvik.tfr.cafe.ee
 jcole@tetra.spaceapes.com
 jorge@linux.jorge.mysql.com
 kaj@work.mysql.com
+konstantin@mysql.com
+kostja@oak.local
 lenz@kallisto.mysql.com
 lenz@mysql.com
 miguel@hegel.(none)

mysql-test/t/fulltext2.test

@@ -17,6 +17,7 @@ CREATE TABLE t1 (
 ) TYPE=MyISAM;
 
 # two-level entry, second-level tree with depth 2
+--disable_query_log
 let $1=260;
 while ($1)
 {
@@ -39,6 +40,7 @@ while ($1)
   eval insert t1 (a) values ('aaayyy');
   dec $1;
 }
+--enable_query_log
 
 # converting to two-level
 repair table t1 quick;