BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysqldump.result:
  Delete: mysql-test/r/mysqldump.result
BitKeeper/deleted/.del-mysqldump.test:
  Delete: mysql-test/t/mysqldump.test
BitKeeper/deleted/.del-compile-netware-max:
  Delete: netware/BUILD/compile-netware-max
BitKeeper/deleted/.del-compile-netware-max-debug:
  Delete: netware/BUILD/compile-netware-max-debug
BitKeeper/deleted/.del-compile-netware-src:
  Delete: netware/BUILD/compile-netware-src
BitKeeper/deleted/.del-knetware.imp:
  Delete: netware/BUILD/knetware.imp
BUILD/compile-pentium-valgrind-max:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
BitKeeper/deleted/.del-openssl.imp:
  Delete: netware/BUILD/openssl.imp
acinclude.m4:
  Auto merged
SSL/cacert.pem:
  Auto merged
SSL/client-cert.pem:
  Auto merged
SSL/server-cert.pem:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
extra/resolveip.c:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/my_global.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_test2.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/fulltext_multi.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/std_data/rpl_loaddata2.dat:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysys/mf_dirname.c:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql-bench/test-transactions.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
client/mysqltest.c:
  Merge with 4.0.16
  Changed version number to '2.0' to avoid confusion with version numbering in 3.23
mysql-test/r/distinct.result:
  Updated results for merge
mysql-test/r/insert.result:
  Updated results for merge
mysql-test/r/insert_select.result:
  Updated results for merge
mysql-test/r/join_outer.result:
  Updated results for merge
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results for merge
mysql-test/r/order_by.result:
  Updated results for merge
mysql-test/r/rpl000009.result:
  Updated results for merge
mysql-test/r/rpl_loaddata.result:
  Updated results for merge
mysql-test/r/rpl_log.result:
  Updated results for merge
mysql-test/r/select_safe.result:
  Updated results for merge
scripts/mysql_install_db.sh:
  Change -eq to =
BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483:
  dummy

sql/item_subselect.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


sql/mysql_priv.h:
  Auto merged

into narttu.mysql.fi:/my/mysql-4.1

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

into narttu.mysql.fi:/my/mysql-4.1


sql/item_subselect.cc:
  Auto merged

extra/resolveip.c:
  After merge fix
mysql-test/mysql-test-run.sh:
  Fixed comment
mysql-test/r/rpl_trunc_binlog.result:
  Updated results
sql/log_event.cc:
  Better (shorter) error message

into mishka.mysql.fi:/home/my/mysql-4.1


include/mysql.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup


client/mysql.cc:
  Fixed indentation
include/my_sys.h:
  Move init_compiled_charsets to own file
include/mysql.h:
  Remove compiler warning	
libmysql/Makefile.shared:
  Move init_compiled_charsets to own file
mysys/Makefile.am:
  Move init_compiled_charsets to own file
mysys/charset.c:
  Move init_compiled_charsets to own file
mysys/my_init.c:
  Remove dependency of charsets
scripts/mysql_create_system_tables.sh:
  Remove run time warning
scripts/mysql_fix_privilege_tables.sql:
  Add help tables
sql/sql_insert.cc:
  Code cleanup

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1

mysql-test/r/row.result:
  fixed error message as it was suggested by Peter Gulutzan
mysql-test/r/subselect.result:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/czech/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/danish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/dutch/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/english/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/estonian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/french/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/german/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/greek/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/hungarian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/italian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/japanese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/korean/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian-ny/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/polish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/portuguese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/romanian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/russian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/serbian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/slovak/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/spanish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/swedish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/ukrainian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan

BitKeeper/etc/logging_ok:
  auto-union
mytest-old.c:
  Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c
BitKeeper/deleted/.del-mysqlshutdown.c:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.rc:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlwatch.c:
  Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-thr_test.c:
  Delete: VC++Files/thr_test/thr_test.c
BitKeeper/deleted/.del-make_win_src_distribution.sh:
  Delete: scripts/make_win_src_distribution.sh
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
  Auto merged
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
  Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
  Auto merged
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
  Auto merged
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
  Auto merged
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
  Auto merged
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
  Auto merged
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
  Auto merged
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
  Auto merged
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
  Auto merged
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
  Auto merged
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
  Auto merged
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
  Auto merged
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
  Auto merged
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
  Auto merged
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
  Auto merged
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
  Auto merged
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
  Auto merged
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
  Auto merged
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
  Auto merged
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
  Auto merged
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
  Auto merged
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
  Auto merged
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
  Auto merged
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
  Auto merged
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
  Auto merged
configure.in:
  Merge with 3.23.58 (Keep old code)
sql/slave.cc:
  Merge with 3.23.58 (Keep old code)
sql/sql_parse.cc:
  Merge with 3.23.58 (Keep old code)

mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged

libmysqld/lib_sql.cc:
  Check for unfetched rows added

libmysqld/lib_sql.cc:
  net->sqlstate should be initialized here

into deer.(none):/home/hf/work/mysql-4.1.stmt

libmysqld/lib_sql.cc:
  arg_parameters now are stored in these THD members
sql/sql_class.h:
  members to store query arguments
sql/sql_prepare.cc:
  query arguments retrieval added for embedded case
  code not necessary in embedded server #ifdefed

fix derived inside subqueries


mysql-test/r/subselect.result:
  error tex changes whi i forgot to commit
mysql-test/t/derived.test:
  code changing
sql/sql_yacc.yy:
  allow derived inside subselects

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1

  Remove unintentional changes in previous push


innobase/row/row0mysql.c:
  Remove unintentional changes in previous push

  Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice


innobase/row/row0mysql.c:
  Fix bug: if one used the rename trick of ibman section 15.1 to recover a temp table, InnoDB asserted because it tried to lock the data dictionary twice

into deer.(none):/home/hf/work/mysql-4.1.stmt

libmysqld/lib_sql.cc:
  check for error
sql/sql_prepare.cc:
  set success mark here

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged

fixed incorrect table name in test


mysql-test/r/derived.result:
  fixed incorrect table name in test
  new test of derived table
mysql-test/t/derived.test:
  fixed incorrect table name in test
  new test of derived table
sql/sql_yacc.yy:
  prohibited using derived tables in UPDATE command

into ice.snake.net:/Users/paul/mysql-4.0

mysql-test/mysql-test-run.sh:
  deamon -> daemon
scripts/mysql_install_db.sh:
  deamon -> daemon
support-files/my-small.cnf.sh:
  deamon -> daemon

into deer.(none):/home/hf/work/mysql-4.1.stmt


sql/sql_parse.cc:
  Auto merged

include/mysql.h:
  read_statistic added to virtual methods
libmysql/client_settings.h:
  interface for cli_read_statistic added
libmysql/libmysql.c:
  read_statistic and mysql_stat code changes
libmysqld/lib_sql.cc:
  emb_read_statistic implemented
  server_version initialized
sql-common/client.c:
  cli_read_statistic added to the table
sql/sql_parse.cc:
  storage of result of COM_STATISTIC changed in embedded library

into mysql.com:/home/mysql_src/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1