Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/fulltext_multi.result:
  Auto merged
mysql-test/r/fulltext_cache.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/r/fulltext_left_join.result:
  Auto merged
sql/handler.h:
  Auto merged
This commit is contained in:
unknown 2001-10-12 17:47:13 +02:00
commit 6db2120514
119 changed files with 5672 additions and 1360 deletions

View file

@ -255,6 +255,7 @@ libmysqld/opt_sum.cc
libmysqld/password.c
libmysqld/procedure.cc
libmysqld/records.cc
libmysqld/repl_failsafe.cc
libmysqld/simple-test
libmysqld/slave.cc
libmysqld/sql_acl.cc