Docs/manual.texi:
  - fix typo

Docs/manual.texi:
  - update News about SHOW LOGS

sql/ha_berkeley.cc:
  - add berkeley_show_logs()
sql/ha_berkeley.h:
  - add berkeley_show_logs()
sql/mysql_priv.h:
  - add show_logs()
sql/sql_lex.h:
  - add show_logs()
sql/sql_parse.cc:
  - add show_logs()
sql/sql_show.cc:
  - add show_logs()
sql/sql_yacc.yy:
  - add show_logs()
Docs/manual.texi:
  - add show_logs()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    forgot to check this in


mysql-test/r/rpl000016.result:
  forgot to check this in

    fixed bug that created empty result files in no-record mode
mysql-test/t/rpl000007.test
    testing non-replication of load data infile when the table is excluded from replication
mysql-test/t/rpl000016.test
    test purge master logs
sql/slave.cc
    fix memory leaks found by  purge master logs test
sql/sql_repl.cc
    fixed race condition and delete before close bug in reset_slave()

Overall comments - coverage testing is a very good thing!


client/mysqltest.c:
  fixed bug that created empty result files in no-record mode
mysql-test/t/rpl000007.test:
  testing non-replication of load data infile when the table is excluded from replication
mysql-test/t/rpl000016.test:
  test purge master logs
sql/slave.cc:
  fix memory leaks found by  purge master logs test
sql/sql_repl.cc:
  fixed race condition and delete before close bug in reset_slave()

myisammrg/myrg_open.c:
  merged

    added system command
myisammrg/myrg_open.c
    fixed coredump when opening an empty union table
sql/sql_repl.cc
    fixed warnings, remove confusing comment, fixed coredump in
    change master to when master.info was corrupted

added new replication test case


client/mysqltest.c:
  added system command
myisammrg/myrg_open.c:
  fixed coredump when opening an empty union table
sql/sql_repl.cc:
  fixed warnings, remove confusing comment, fixed coredump in
  change master to when master.info was corrupted

mysql-test/t/ft0000001.test:
  comments cleared up
myisammrg/myrg_open.c:
  empty MRG bug fixed again (fix from 1.8 was removed in 1.9)

BitKeeper/etc/gone:
  auto-merge

    fixes for Bourne shell
    removed colors
    optimized echo/expr for bash


mysql-test/mysql-test-run.sh:
  fixes for Bourne shell
  removed colors
  optimized echo/expr for bash

BitKeeper/deleted/.del-logging_ok~32b6551b8288c2fa:
  ***MISSING WEAVE***
BitKeeper/etc/logging_ok:
  Auto merged

BitKeeper/deleted/.del-README.gcov:
  ***MISSING WEAVE***
BitKeeper/etc/logging_ok:
  ***MISSING WEAVE***

BUILD/compile-pentium-debug:
  fox for parallel make
BUILD/compile-pentium-gcov:
  fix for parallel make
BUILD/compile-pentium:
  fix to enable parallel make when recursing to subdirectories
Build-tools/Do-all-build-steps:
  fix for parallel make, remove the stale comment to make Tim happy
Build-tools/Do-rpm:
  fix for parallel make

BitKeeper/etc/ignore:
  Added BitKeeper/tmp/gone to the ignore list

BitKeeper/etc/ignore:
  Added mysql-test/install_test_db mysql-test/mysql-test-run to the ignore list
include/global.h:
  another fix for MIT-threads

    fixed typo
scripts/make_binary_distribution.sh
    added .MRG and .frm files


mysql-test/Makefile.am:
  fixed typo
scripts/make_binary_distribution.sh:
  added .MRG and .frm files

include/global.h:
  Fix for MIT-threads

sql/sql_parse.cc:
  we were using wrong strdup

mysql-test-run.sh	fixes for distribution
Makefile.am	Fixes for distribution


mysql-test/Makefile.am:
  Fixes for distribution
mysql-test/mysql-test-run.sh:
  fixes for distribution
mysql-test/install_test_db.sh:
  fixes for distribution

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


BitKeeper/etc/logging_ok:
  Auto converge

mysql-test/mysql-test-run:
  fixed bug that unconditionally restarted both servers before each test
  added support for slave-master-info.opt to specify master info 
  options and override defaults for an individual test
  fixed race conditions in slave start/slave stop
  added a new rpl test case
sql/sql_repl.cc:
  fixed race conditions in slave start/slave stop

mysql-test/Makefile.am:
  Removed README

Do-patch-file	Update for new web structure
Makefile.am	Added dependency for manual_toc.html
Makefile.am	Replaced chmod with RM to avoid error message


include/Makefile.am:
  Replaced chmod with RM to avoid error message
Docs/Makefile.am:
  Added dependency for manual_toc.html
Build-tools/Do-patch-file:
  Update for new web structure
support-files/mysql.spec.sh:
  Don't install BDB
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


BitKeeper/etc/logging_ok:
  Auto converge

Docs/manual.texi:
  minor wording change in LOAD DATA section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

No commit message

added a new test case that relies on --result-file


client/mysqltest.c:
  allow a mix of --result-file and @ result file specifications
mysql-test/mysql-test-run:
  -record option
  -R options to mysql-test so taht result files will be compared

    add --result-file option
mysql-test/mysql-test-run
    do a really good job to kill mysqld if it is stuck


client/mysqltest.c:
  add --result-file option
mysql-test/mysql-test-run:
  do a really good job to kill mysqld if it is stuck

mysql-test/mysql-test-run:
  added support for copying tables into datadir - now only MRG and FRM
  files are copied - will add others as we come up with samples

sql/filesort.cc:
  merged

ft0000002.test  several ft-indexes test
filesort.cc	DBUG_PRINT's added


sql/filesort.cc:
  more DBUG_PRINT's added
mysql-test/t/ft0000001.test:
  more tests added

Remove not used BDB logs on shutdown
Don't give warnings for repair on slaves
Fixed transaction log files


Docs/manual.texi:
  Updated 'known bugs'
include/my_sys.h:
  Added define for checking number of bytes left in the IO_CACHE
mysql-test/mysql-test-run:
  Small bug fixes
mysys/mf_iocache2.c:
  Use new define
sql/filesort.cc:
  Temporary fix for FULLTEXT index
sql/ha_berkeley.cc:
  Fix for delete in tables with hidden primary key
  Remove not used BDB logs on shutdown
sql/ha_myisam.cc:
  Don't give warnings for repair on slaves
sql/hostname.cc:
  Portability fix
sql/log.cc:
  Fix transaction log files
sql/log_event.h:
  portability fix
sql/slave.cc:
  Don't give warnings for repair on slaves
sql/sql_class.h:
  Cleanup
sql/sql_parse.cc:
  Fixed typo

sql/log_event.h:
  fixed load data infile replication for alpha

    last fix in send_file() was wrong


sql/sql_repl.cc:
  last fix in send_file() was wrong

sql/log_event.h:
  changed new/delete for Log_event to use my_malloc/my_free
sql/mysql_priv.h:
  wait for slave to get going
sql/mysqld.cc:
  wait for slave to get going in SLAVE START
sql/slave.cc:
  fixed more memory leaks
sql/sql_repl.cc:
  file name was not being \0 terminated in send_file

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