configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
mysql-test/r/fulltext.result:
  SCCS merged
sql/mysqld.cc:
  SCCS merged

First (incomplete) version of transaction and as3ap tests.


BitKeeper/etc/ignore:
  Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
  Update fulltext results after merge
sql-bench/Makefile.am:
  Added transaction test
sql-bench/run-all-tests.sh:
  Added transaction test
sql-bench/server-cfg.sh:
  Added transaction test
sql-bench/test-ATIS.sh:
  Cleanup
sql/item_func.cc:
  Fix bad merge
sql/mysqld.cc:
  Cleanup
sql/sql_base.cc:
  Fix bad merge
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  Fix bad merge
sql/sql_select.cc:
  Fix bad merge
sql/sql_union.cc:
  Fix bad merge
tools/mysqlmanager.c:
  C

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

LOCATE() is now case sensitive


BUILD/compile-alpha-cxx:
  Don't build manager because it fails with linker error on Linux Alpha
Docs/manual.texi:
  Changelog
myisam/mi_check.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_open.c:
  Fix bug when repairing compressed MyISAM files
myisam/mi_packrec.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamchk.c:
  Fix bug when repairing compressed MyISAM files
myisam/myisamdef.h:
  Fix bug when repairing compressed MyISAM files
mysql-test/r/func_group.result:
  Fix result for new RND function
mysql-test/r/func_math.result:
  Fix result for new RND function
mysql-test/r/func_str.result:
  test of new locate()
mysql-test/t/func_str.test:
  test of new locate()
sql/item_func.cc:
  LOCATE() is now case sensitive
sql/sql_string.cc:
  LOCATE() is now case sensitive
sql/sql_string.h:
  LOCATE() is now case sensitive

mysys/my_seek.c:
  Remove warning

Docs/manual.texi:
  Changelog

sql/mysqld.cc:
  Auto merged

signal. Tested to the extent that it does not break Linux. Could not test on
Darwin because the machine was not reachable. Will push anyway - at least it
does not make things worse. Testing on Darwin is needed, however.


sql/mysqld.cc:
  backport of shutdown fix for platforms that cannot break a syscall with a signal

Docs/manual.texi:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
configure.in:
  no merge - used local
mysql-test/r/fulltext.result:
  no merge - used local
mysql-test/r/myisam.result:
  no merge - used local
sql/item_func.cc:
  no merge - used local
sql/sql_delete.cc:
  no merge - used local
sql/sql_parse.cc:
  no merge - used local
sql/sql_select.cc:
  no merge - used local

it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
re-disabled implicit ft initialization


sql/item_func.cc:
  re-disabled implicit initialization that was re-enabled (by me)
  for reasons unknown (at least the code passed all the tests)
sql/mysql_priv.h:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_base.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_parse.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_select.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added note that usernames in GRANT don't allow wildcards.

sql/mysqld.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  ChangeLog
sql/mysqld.cc:
  Cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

Docs/mirrors.texi:
  Fixup for mirrors file.

  Change list format


Docs/mirrors.texi:
  Change list format

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0

  new file

--manager implies --skip-gdb-magic
(which was introduced to make --gdb usable w/o manager)

mysql-test/r/fulltext_distinct.result:
  boolean test added
mysql-test/t/fulltext_distinct.test:
  boolean test added
mysql-test/r/fulltext_left_join.result:
  boolean test added
mysql-test/t/fulltext_left_join.test:
  boolean test added

Updated reserved words list in manual.


Docs/Support/update-reserved-words.pl:
  Fix to reserved words script, 2 keywords and 15 synonyms were missing.
Docs/manual.texi:
  Updated reserved word list.

mysql-test/fix-result:
  updated version
mysql-test/r/rpl_log.result:
  fixed result to be portable

  Remove "for windows"
  Updated contributed software link


Docs/manual.texi:
  Remove "for windows"

  Fix a seg fault if a lock wait timeout is exceeded at the some time someone grants the lock


innobase/srv/srv0srv.c:
  Fix a seg fault if a lock wait timeout is exceeded at the some time someone grants the lock

into co3064164-a.bitbike.com:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

Docs/manual.texi:
  Updated changelog.
  Update info about MERGE tables.
  Moved section 'Why so many open tables'
mysql-test/r/create.result:
  Added test of types in CREATE
mysql-test/t/create.test:
  Added test of types in CREATE
sql/item_func.cc:
  More different values for RAND(nr) and RAND(nr+1)

was up to date.


Docs/manual.texi:
  ChangeLog
configure.in:
  Version number change
mysql-test/r/myisam.result:
  Test of optimize table
mysql-test/t/myisam.test:
  Test of optimize table