fixed auto set of server id
sql/sql_repl.cc
    do not allow slave to replicate if master id was not supplied
sql/sql_repl.h
    fix for server_id


sql/mysqld.cc:
  fixed auto set of server id
sql/sql_repl.cc:
  do not allow slave to replicate if master id was not supplied
sql/sql_repl.h:
  fix for server_id

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  SCCS merged

Change DROP TABLE to first drop the data, then the .frm file


Docs/manual.texi:
  Updated TODO and Changelog
include/Makefile.am:
  Portability fix
mysql-test/misc/select.res:
  ***MISSING WEAVE***
mysys/mf_iocache2.c:
  cleanup
scripts/mysqlhotcopy.sh:
  Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/limits/pg.cfg:
  Updated to new crash-me
sql-bench/server-cfg.sh:
  Fixes for pg 7.0.2
sql/ha_berkeley.cc:
  Lots of BDB table fixes
sql/ha_berkeley.h:
  Lots of BDB table fixes
sql/handler.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
  Fixes for empty hostnames
sql/log.cc:
  Fixed transaction logging
sql/share/swedish/errmsg.OLD:
  cleanup
sql/sql_delete.cc:
  Fixes for logging
sql/sql_insert.cc:
  Fixes for logging
sql/sql_select.cc:
  Fixes for BDB tables
sql/sql_table.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
  Fixes for logging
BitKeeper/etc/ignore:
  Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.sashanet.com:/home/sasha/src/bk/mysql

updated test suite to always test if slave obeys stop/start commands 


mysql-test/include/master-slave.inc:
  test if the slave actually stops and starts in response to slave start/slave stop
sql/log_event.cc:
  call the right constructor - I am 99% sure this is what cause sporadic failures of rpl000001
sql/share/romanian/errmsg.sys:
  not changed

mrg000001.dummy.result	Change mode to -rw-rw-r--


mysql-test/r/mrg000001.dummy.result:
  Change mode to -rw-rw-r--
mysql-test/r/mrg000001.result:
  Change mode to -rw-rw-r--

BitKeeper/etc/gone:
  auto-merge
BitKeeper/etc/ignore:
  merged, cleaned up

myrg_info.c	merge+insert (v.3)
myrg_extra.c	merge+insert (v.3)
ignore  	cleanup


BitKeeper/etc/ignore:
  cleanup
myisammrg/myrg_extra.c:
  merge+insert (v.3)
myisammrg/myrg_info.c:
  merge+insert (v.3)
sql/sql_base.cc:
  merge+insert (v.3)

scripts/mysqld_multi.sh:
  Small changes and bug fixes.

Docs/manual.texi:
  Added documentation about running multiple MySQL servers.

into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge

BitKeeper/etc/ignore:
  Added BitKeeper/tmp/applied.list BitKeeper/tmp/backup.list BitKeeper/tmp/backup.sfio BitKeeper/tmp/sfile.list to the ignore list
sql/slave.cc:
  log warnings from replicated load data infile
sql/sql_load.cc:
  do not log load data infile from the master to update log on the slave

Full fix shall be in MySQL 4.1. (This is a hard one (!))


sql/opt_range.cc:
  Temporary fix for handling wild_one at end of string (key compression).
  A full fix shall be somewhere in 4.1 (!) This is a hard one...
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/ignore:
  Added mysql-test/var/slave-data/mysql-bin.001 mysql-test/var/slave-data/mysql-bin.002 mysql-test/var/slave-data/mysql-bin.003 mysql-test/var/slave-data/mysql-bin.004 mysql-test/var/slave-data/mysql-bin.005 mysql-test/var/slave-data/mysql-bin.006 mysql-test/var/slave-data/mysql-bin.007 mysql-test/var/slave-data/mysql-bin.008 mysql-test/var/slave-data/mysql-bin.009 mysql-test/var/slave-data/mysql-bin.010 mysql-test/var/slave-data/mysql-bin.011 mysql-test/var/slave-data/mysql-bin.012 mysql-test/var/slave-data/mysql-bin.013 mysql-test/var/slave-data/mysql-bin.014 mysql-test/var/slave-data/mysql-bin.index to the ignore list
mysql-test/mysql-test-run:
  re-added --log-bin --log-slave updates to slave startup options
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication

    removed extra files, adjusted for renames


mysql-test/Makefile.am:
  removed extra files, adjusted for renames

into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged

Build-tools/Do-all-build-steps:
  added --without-berkeley-db
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.sashanet.com:/home/sasha/src/bk/mysql

ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames


BitKeeper/etc/ignore:
  Added mysql-test/var/lib/test/test3.frm mysql-test/var/lib/test/test3.MRG to the ignore list
mysql-test/t/mrg000001.test:
  fixed paths
sql/log.cc:
  fixed mutex problem

BUILD/compile-pentium-gcov:
  use second CPU
BUILD/compile-pentium:
  I got my second CPU
Build-tools/Do-all-build-steps:
  use second CPU
Build-tools/Do-compile:
  use second CPU

mrg000001.dummy.result	Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result
mrg000001.result	Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result
mrg000001.test	Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test


mysql-test/t/mrg000001.test:
  Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test
mysql-test/r/mrg000001.dummy.result:
  Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result
mysql-test/r/mrg000001.result:
  Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result

BitKeeper/etc/logging_ok:
  Auto converge
configure.in:
  Auto merged
mysql-test/misc/select.res:
  ***MISSING WEAVE***
BitKeeper/etc/ignore:
  Added BitKeeper/etc/config BitKeeper/tmp/CONTENTS BitKeeper/tmp/patch BitKeeper/tmp/pid to the ignore list
mysql-test/mysql-test-run:
  merge

mysql-test/misc/mysql-test_V1.9.pl:
  mvdir
mysql-test/misc/select.res:
  ***MISSING WEAVE***
mysql-test/misc/select.tst:
  mvdir

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

BitKeeper/deleted/.del-README~b8e00a1b57b91f69:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~2bddc2706d0834d0:
  ***MISSING WEAVE***
mysql-test/r/alt000001.result:
  mvdir
mysql-test/r/ins000001.result:
  mvdir
mysql-test/r/rpl000001.a.result:
  mvdir
mysql-test/r/rpl000001.b.result:
  mvdir
mysql-test/r/rpl000002.result:
  mvdir
mysql-test/r/rpl000003.result:
  mvdir
mysql-test/r/rpl000004.a.result:
  mvdir
mysql-test/r/rpl000004.b.result:
  mvdir
mysql-test/r/rpl000005.result:
  mvdir
mysql-test/r/rpl000006.result:
  mvdir
mysql-test/r/rpl000007.result:
  mvdir
mysql-test/r/rpl000008.result:
  mvdir
mysql-test/r/rpl000009.result:
  mvdir
mysql-test/r/rpl000010.result:
  mvdir
mysql-test/r/rpl000011.result:
  mvdir
mysql-test/r/rpl000012.result:
  mvdir
mysql-test/r/rpl000012.status.result:
  mvdir
mysql-test/r/rpl000013.result:
  mvdir
mysql-test/r/rpl000013.status.result:
  mvdir
mysql-test/r/sel000001.result:
  mvdir
mysql-test/r/sel000002.result:
  mvdir
mysql-test/r/sel000003.result:
  mvdir
mysql-test/r/sel000004.result:
  mvdir
mysql-test/r/sel000005.result:
  mvdir
mysql-test/r/sel000006.result:
  mvdir
mysql-test/r/sel000007.result:
  mvdir
mysql-test/r/sel000008.result:
  mvdir
mysql-test/r/sel000009.result:
  mvdir
mysql-test/r/sel000010.result:
  mvdir
mysql-test/r/sel000011.result:
  mvdir
mysql-test/r/sel000012.result:
  mvdir
mysql-test/r/sel000013.result:
  mvdir
mysql-test/r/sel000014.result:
  mvdir
mysql-test/r/sel000015.result:
  mvdir
mysql-test/r/sel000016.result:
  mvdir
mysql-test/r/sel000017.result:
  mvdir
mysql-test/r/sel000018.result:
  mvdir
mysql-test/r/sel000019.result:
  mvdir
mysql-test/r/sel000020.result:
  mvdir
mysql-test/r/sel000021.result:
  mvdir
mysql-test/r/sel000022.result:
  mvdir
mysql-test/r/sel000023.result:
  mvdir
mysql-test/r/sel000024.result:
  mvdir
mysql-test/r/sel000025.result:
  mvdir
mysql-test/r/sel000026.result:
  mvdir
mysql-test/r/sel000027.result:
  mvdir
mysql-test/r/sel000028.result:
  mvdir
mysql-test/r/sel000029.result:
  mvdir
mysql-test/r/sel000030.result:
  mvdir
mysql-test/r/sel000100.result:
  mvdir
mysql-test/r/shw000001.result:
  mvdir
mysql-test/t/README:
  mvdir
mysql-test/t/err000001.test:
  mvdir
mysql-test/t/rpl000007-slave.opt:
  mvdir
mysql-test/t/rpl000008-slave.opt:
  mvdir
mysql-test/t/rpl000009-slave.opt:
  mvdir
mysql-test/t/rpl000010-slave.opt:
  mvdir
mysql-test/t/rpl000013-slave.opt:
  mvdir
BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~108667adaeabe3f5:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~c5aaceda4c2b1a8:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5:
  ***MISSING WEAVE***
mysql-test/std_data/words.dat:
  Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat
BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf:
  ***MISSING WEAVE***
Makefile.am:
  add mysql-test to distribution
configure.in:
  added mysql-test
libmysql/Makefile.am:
  include hash.h
libmysql/Makefile.shared:
  add hash to libmysqlclient
mysql-test/Makefile.am:
  mysql-test is now in source dist also
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysql-test/install_test_db:
  renamed file, moved to different directory, and fixed up to work on binary dist
mysql-test/mysql-test-run:
  clean-up of test suite, make it work on binary dist
mysql-test/t/alt000001.test:
  moved directory
mysql-test/t/ins000001.test:
  moved directory
mysql-test/t/rpl000001.test:
  moved dir
mysql-test/t/rpl000002.test:
  moved dir
mysql-test/t/rpl000003.test:
  moved dir
mysql-test/t/rpl000004.test:
  moved dir
mysql-test/t/rpl000005.test:
  moved dir
mysql-test/t/rpl000006.test:
  moved dir
mysql-test/t/rpl000007.test:
  moved dir
mysql-test/t/rpl000008.test:
  moved dir
mysql-test/t/rpl000009.test:
  moved dir
mysql-test/t/rpl000010.test:
  moved dir
mysql-test/t/rpl000011.test:
  moved dir
mysql-test/t/rpl000012.test:
  moved dir
mysql-test/t/rpl000013.test:
  moved dir
mysql-test/t/sel000001.test:
  moved dir
mysql-test/t/sel000002.test:
  moved dir
BitKeeper/etc/ignore:
  Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list
mysql-test/t/sel000003.test:
  moved dir
mysql-test/t/sel000004.test:
  moved dir
mysql-test/t/sel000005.test:
  moved dir
mysql-test/t/sel000100.test:
  moved dir
mysql-test/t/shw000001.test:
  moved dir
scripts/make_binary_distribution.sh:
  fixes to include mysql-test
  added -debug option to exit after building temp dir before tar.gz 
  removed a bunch of SCCS files

sql/sql_base.cc:
  merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changed name mysql_multi_mysqld to mysqld_multi.
  This is because safe_mysqld will be converted to mysqld_safe
  in the future and the new name is shorter than the old one.
scripts/Makefile.am:
  Added mysqld_multi
scripts/mysqld_multi.sh:
  Changed name from mysql_multi_mysqld to mysqld_multi

myrg_info.c	merge+insert (alternate take)
myrg_extra.c	merge+insert (alternate take)
mymrgdef.h	merge+insert (alternate take)
sql_base.cc	open_table --> open_or_reset_table (needed for MERGE)


sql/sql_base.cc:
  open_table --> open_or_reset_table (needed for MERGE)
myisammrg/mymrgdef.h:
  merge+insert (alternate take)
myisammrg/myrg_extra.c:
  merge+insert (alternate take)
myisammrg/myrg_info.c:
  merge+insert (alternate take)
myisammrg/myrg_rrnd.c:
  merge+insert (alternate take)

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

Docs/manual.texi:
  Updated nodes
sql/ha_berkeley.cc:
  Don't count deletes

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

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

Docs/manual.texi:
  Bug fix with HEAP type tables.

A lot of new functions for BDB tables
Fix for DROP DATABASE on windows
Default server_id variables


Docs/manual.texi:
  Update of BDB info + Changes
configure.in:
  Added test of readlink
include/mysqld_error.h:
  Added new error message
sql/ha_berkeley.cc:
  Added storing of status, CHECK, ANALYZE and OPTIMIZE TABLE
sql/ha_berkeley.h:
  Added storing of status, CHECK, ANALYZE and OPTIMIZE TABLE
sql/handler.cc:
  Only write full transactions to binary log
sql/hostname.cc:
  cleanup
sql/log.cc:
  Only write full transactions to binary log
sql/log_event.h:
  Only write full transactions to binary log
sql/mf_iocache.cc:
  Changes to be able to use IO_CACHE to save statements in a transaction
sql/mysql_priv.h:
  New variables
sql/mysqld.cc:
  Only write full transactions to binary log
  Added default values for server_id
  Lots of new bdb options
sql/share/czech/errmsg.sys:
  Added new error message
sql/share/czech/errmsg.txt:
  Added new error message
sql/share/danish/errmsg.sys:
  Added new error message
sql/share/danish/errmsg.txt:
  Added new error message
sql/share/dutch/errmsg.sys:
  Added new error message
sql/share/dutch/errmsg.txt:
  Added new error message
sql/share/english/errmsg.sys:
  Added new error message
sql/share/english/errmsg.txt:
  Added new error message
sql/share/estonian/errmsg.sys:
  Added new error message
sql/share/estonian/errmsg.txt:
  Added new error message
sql/share/french/errmsg.sys:
  Added new error message
sql/share/french/errmsg.txt:
  Added new error message
sql/share/german/errmsg.sys:
  Added new error message
sql/share/german/errmsg.txt:
  Added new error message
sql/share/greek/errmsg.sys:
  Added new error message
sql/share/greek/errmsg.txt:
  Added new error message
sql/share/hungarian/errmsg.sys:
  Added new error message
sql/share/hungarian/errmsg.txt:
  Added new error message
sql/share/italian/errmsg.sys:
  Added new error message
sql/share/italian/errmsg.txt:
  Added new error message
sql/share/japanese/errmsg.sys:
  Added new error message
sql/share/japanese/errmsg.txt:
  Added new error message
sql/share/korean/errmsg.sys:
  Added new error message
sql/share/korean/errmsg.txt:
  Added new error message
sql/share/norwegian-ny/errmsg.txt:
  Added new error message
sql/share/norwegian/errmsg.txt:
  Added new error message
sql/share/polish/errmsg.sys:
  Added new error message
sql/share/polish/errmsg.txt:
  Added new error message
sql/share/portuguese/errmsg.sys:
  Added new error message
sql/share/portuguese/errmsg.txt:
  Added new error message
sql/share/romanian/errmsg.txt:
  Added new error message
sql/share/russian/errmsg.sys:
  Added new error message
sql/share/russian/errmsg.txt:
  Added new error message
sql/share/slovak/errmsg.sys:
  Added new error message
sql/share/slovak/errmsg.txt:
  Added new error message
sql/share/spanish/errmsg.sys:
  Added new error message
sql/share/spanish/errmsg.txt:
  Added new error message
sql/share/swedish/errmsg.OLD:
  Added new error message
sql/share/swedish/errmsg.sys:
  Added new error message
sql/share/swedish/errmsg.txt:
  Added new error message
sql/sql_base.cc:
  cleanup
sql/sql_class.cc:
  Only write full transactions to binary log
sql/sql_class.h:
  Added error handling of failed writes to logs
sql/sql_db.cc:
  Fix for DROP DATABASE on windows
sql/sql_delete.cc:
  Only write full transactions to binary log
sql/sql_insert.cc:
  Only write full transactions to binary log
sql/sql_load.cc:
  Only write full transactions to binary log
sql/sql_parse.cc:
  End transaction at DROP, RENAME, CREATE and TRUNCATE
sql/sql_table.cc:
  Fixes for ALTER TABLE on BDB tables for windows
sql/sql_update.cc:
  Only write full transactions to binary log
sql/sql_yacc.yy:
  AGAINST is not anymore a reserved word
support-files/my-huge.cnf.sh:
  Changed to use binary log
support-files/my-large.cnf.sh:
  Changed to use binary log
support-files/my-medium.cnf.sh:
  Changed to use binary log
support-files/my-small.cnf.sh:
  Changed to use binary log

Docs/manual.texi:
  Added documentation about new client, mysql_multi_mysqld.
  This program is meant for managing multiple MySQL servers.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

myrg_info.c	merge + insert OK
mymrgdef.h	merge + insert OK
mrg000001.test  test for the above
mysql-test-run	compatibility (FreeBSD) changes from mysql-4.0 backpropagated


mysql-test/mysql-test-run:
  compatibility (FreeBSD) changes from mysql-4.0 backpropagated
myisammrg/mymrgdef.h:
  merge + insert OK
myisammrg/myrg_info.c:
  merge + insert OK
myisammrg/myrg_rrnd.c:
  merge + insert OK