into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into mysql.com:/home/jimw/my/mysql-5.0-clean

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4

sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Cleanup

sql/sql_lex.h:
  LEX::requires_prelocking():
    Portability fix. Seems that VC++ does not understand implicit pointer
    to bool conversion.

into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Correction after manual merge.


mysql-test/r/func_str.result:
  Correction after manual merge.

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

sql/item_strfunc.cc:
  Auto merged

into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged

mysql-test/r/fulltext.result:
  after merge - test results updated
sql/sql_class.cc:
  protection

mysql-test/lib/init_db.sql:
  Fixed mysql-test-run.pl's system tables to correspond to the real ones.

into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged

  Delete: mysql-test/t/ndb_multi.test
.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc


BitKeeper/deleted/.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc
BitKeeper/deleted/.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
BitKeeper/deleted/.del-ndb_multi.test~651e6ccb21dab6d9:
  Delete: mysql-test/t/ndb_multi.test

sql/mysqld.cc:
  Use new message for startup
sql/share/errmsg.txt:
  Revert change to ER_READY, add new ER_STARTUP to use instead

  bug#4914 added --help and usage information


scripts/mysqldumpslow.sh:
  bug#4914 added --help and usage information

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/page0page.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

    preserve backward compatibility


sql/mysqld.cc:
  preserve backward compatibility

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

    recalculate stats/gws for the last word in the index too
    remove unused code


myisam/myisam_ftdump.c:
  recalculate stats/gws for the last word in the index too
  remove unused code

mysql-test/r/fulltext.result:
  new test, duplicate test removed
mysql-test/t/fulltext.test:
  new test, duplicate test removed
sql/slave.cc:
  close relay log explicitly

    debug printouts
    ndb documentation update


ndb/include/ndbapi/Ndb.hpp:
  ndb documentation update
ndb/src/kernel/blocks/suma/Suma.cpp:
  fixed mem leak in subscriction handling in Suma
  debug printouts
ndb/src/kernel/blocks/suma/Suma.hpp:
  fixed mem leak in subscriction handling in Suma

  Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.


sql/item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
mysql-test/t/func_str.test:
  Added a test case for bug #8669.
mysql-test/r/func_str.result:
  Added a test case for bug #8669.

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

  bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists


configure.in:
  bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

  Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris


bdb/dist/s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_java:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_readme:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_test:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_vxworks:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32_dsp:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
scripts/make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_src_distribution.sh:
  Copy all content in mysql-test
mysql-test/mysql-test-run.pl:
  Removed -c from /bin/sh call

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/sql_parse.cc:
  Auto merged