sel000031.test	backpropagated from mysql-4.0
sel000014.result	backpropagated from mysql-4.0
sel000006.test	s|r/3.23/|r/|
sel000007.test	s|r/3.23/|r/|
sel000008.test	s|r/3.23/|r/|
sel000009.test	s|r/3.23/|r/|
sel000010.test	s|r/3.23/|r/|
sel000011.test	s|r/3.23/|r/|
sel000012.test	s|r/3.23/|r/|
sel000013.test	s|r/3.23/|r/|
sel000014.test	s|r/3.23/|r/|
sel000015.test	s|r/3.23/|r/|
sel000016.test	s|r/3.23/|r/|
sel000017.test	s|r/3.23/|r/|
sel000018.test	s|r/3.23/|r/|
sel000019.test	s|r/3.23/|r/|
sel000020.test	s|r/3.23/|r/|
sel000021.test	s|r/3.23/|r/|
sel000022.test	s|r/3.23/|r/|
sel000023.test	s|r/3.23/|r/|
sel000024.test	s|r/3.23/|r/|
sel000025.test	s|r/3.23/|r/|
sel000026.test	s|r/3.23/|r/|
sel000027.test	s|r/3.23/|r/|
sel000028.test	s|r/3.23/|r/|
sel000029.test	s|r/3.23/|r/|
sel000030.test	s|r/3.23/|r/|
sel000033.test	s|r/3.23/|r/|
sel000005.test	s|r/3.23/|r/|
ft0000001.test	s|r/3.23/|r/|
sel000004.test	s|r/3.23/|r/|


mysql-test/t/sel000004.test:
  s|r/3.23/|r/|
mysql-test/t/ft0000001.test:
  s|r/3.23/|r/|
mysql-test/t/sel000005.test:
  s|r/3.23/|r/|
mysql-test/t/sel000006.test:
  s|r/3.23/|r/|
mysql-test/t/sel000007.test:
  s|r/3.23/|r/|
mysql-test/t/sel000008.test:
  s|r/3.23/|r/|
mysql-test/t/sel000009.test:
  s|r/3.23/|r/|
mysql-test/t/sel000010.test:
  s|r/3.23/|r/|
mysql-test/t/sel000011.test:
  s|r/3.23/|r/|
mysql-test/t/sel000012.test:
  s|r/3.23/|r/|
mysql-test/t/sel000013.test:
  s|r/3.23/|r/|
mysql-test/t/sel000014.test:
  s|r/3.23/|r/|
mysql-test/t/sel000015.test:
  s|r/3.23/|r/|
mysql-test/t/sel000016.test:
  s|r/3.23/|r/|
mysql-test/t/sel000017.test:
  s|r/3.23/|r/|
mysql-test/t/sel000018.test:
  s|r/3.23/|r/|
mysql-test/t/sel000019.test:
  s|r/3.23/|r/|
mysql-test/t/sel000020.test:
  s|r/3.23/|r/|
mysql-test/t/sel000021.test:
  s|r/3.23/|r/|
mysql-test/t/sel000022.test:
  s|r/3.23/|r/|
mysql-test/t/sel000023.test:
  s|r/3.23/|r/|
mysql-test/t/sel000024.test:
  s|r/3.23/|r/|
mysql-test/t/sel000025.test:
  s|r/3.23/|r/|
mysql-test/t/sel000026.test:
  s|r/3.23/|r/|
mysql-test/t/sel000027.test:
  s|r/3.23/|r/|
mysql-test/t/sel000028.test:
  s|r/3.23/|r/|
mysql-test/t/sel000029.test:
  s|r/3.23/|r/|
mysql-test/t/sel000030.test:
  s|r/3.23/|r/|
mysql-test/t/sel000033.test:
  s|r/3.23/|r/|
mysql-test/r/sel000014.result:
  backpropagated from mysql-4.0
mysql-test/t/sel000031.test:
  backpropagated from mysql-4.0
mysql-test/t/sel000032.test:
  backpropagated from mysql-4.0

mysql-test/t/sel000004.test:
  backpropagated from mysql-4.0
mysql-test/t/sel000005.test:
  backpropagated from mysql-4.0
mysql-test/r/sel000004.result:
  backpropagated from mysql-4.0
mysql-test/r/sel000005.result:
  backpropagated from mysql-4.0

Fixed newly introduced bug in update


BitKeeper/etc/ignore:
  Added libmysql_r/conf_to_src to the ignore list
sql/filesort.cc:
  Removed init that crashed BDB
sql/ha_berkeley.cc:
  Fixed bug in sub AUTO_INCREMENT keys in BDB tables
sql/opt_range.cc:
  Cleanup
sql/sql_update.cc:
  Fixed newly introduced bug in update

Docs/manual.texi:
  Auto merged

Put PRIMARY KEY and UNIQUE keys before other keys
Fixes for auto_increment keys for BDB tables


Docs/manual.texi:
  Changelog
sql/ha_berkeley.cc:
  Fixes for auto_increment keys
sql/sql_table.cc:
  Put PRIMARY KEY and UNIQUE keys before other keys
sql/sql_update.cc:
  Bugfix when using a multi-part unique key in the SET and WHERE part

better error diagnostic in SLAVE START


sql/mini_client.cc:
  if we fail to connect, we need to free the inited structure
sql/mysqld.cc:
  added end_slave() for slave cleanup
sql/slave.cc:
  fixed serveral memory leaks
sql/slave.h:
  added end_master_info() for clean up
sql/sql_class.cc:
  not changed
sql/sql_repl.cc:
  initialize master info before creating slave thread in SLAVE START -
  this way we can easily send an error to the client if something is 
  wrong in init_master_info

    updates for the test suite
Docs/Support/test-make-manual
    abort with a message if a utility fails
    open the manual in a browser on success 


Docs/manual.texi:
  updates for the test suite
Docs/Support/test-make-manual:
  abort with a message if a utility fails
  open the manual in a browser on success

sql/mysqld.cc:
  added proper close to logs on server exit

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


mysql-test/mysql-test-run:
  Auto merged

    reversed gcov to work the old way - the worst thing that can happen 
    if slave and master execute the same code at the same time is that
    we get a lesser  count on the code branch execution, but in any case,
    it will be at least counted once, which is really all we care.
    
    Besides, the source tracking is most likely not thread safe, but this
    is ok for the same reason.


mysql-test/mysql-test-run:
  reversed gcov to work the old way - the worst thing that can happen 
  if slave and master execute the same code at the same time is that
  we get a lesser  count on the code branch execution, but in any case,
  it will be at least counted once, which is really all we care.
  
  Besides, the source tracking is most likely not thread safe, but this
  is ok for the same reason.

myrg_open.c	delayed queue allocation


myisammrg/myrg_open.c:
  delayed queue allocation
BitKeeper/etc/ignore:
  cleaned up, AGAIN!

                it's yet another mysqld hidden feature
                --exit-info=256 is like --core-file but prints info at exit.
                --exit-info itself implies also one-thread (undocumented)


mysql-test/mysql-test-run:
  --core-file changed to --exit-info=256
  it's yet another mysqld hidden feature
  --exit-info=256 is like --core-file but prints 
  info at exit.
  --exit-info itself implies also one-thread (undocumented)

    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

mysqldumpslow.sh   | first line should be #!@PERL@
mysqld_multi.sh    | not #@perl@ or #!/usr/bin/perl


client/mysqldump.c:
  typo fixed

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***