into work.mysql.com:/d1/users/tim/my/work

Docs/manual.texi:
  clean up recent change notes

into work.mysql.com:/d1/users/tim/my/work


BitKeeper/etc/logging_ok:
  Auto converge

added test/sanity check for master_pos_wait()


mysql-test/r/rpl000016.result:
  do show slave status to test master_pos_wait()
mysql-test/t/rpl000001.test:
  no sleep
mysql-test/t/rpl000002.test:
  no sleep
mysql-test/t/rpl000003.test:
  no sleep
mysql-test/t/rpl000007.test:
  !sleep
mysql-test/t/rpl000008.test:
  !sleep
mysql-test/t/rpl000009.test:
  no sleep
mysql-test/t/rpl000010.test:
  no sleep
mysql-test/t/rpl000011.test:
  no sleep
mysql-test/t/rpl000012.test:
  no sleep
mysql-test/t/rpl000013.test:
  no sleep
mysql-test/t/rpl000014.test:
  no sleep
mysql-test/t/rpl000015.test:
  no sleep
mysql-test/t/rpl000016.test:
  no sleep, test that master_pos_wait() works right
sql/slave.cc:
  fixed bug in master_pos_wait()

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


sql/log_event.h:
  Auto merged

sql/log_event.h:
  fixed compiler error

client/errmsg.c:
  fix copyright notice
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Made test more reliable on slow machines


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Made --silent more silent
include/my_pthread.h:
  Removed warning on OSF1
mysql-test/install_test_db.sh:
  Allow connections from 127.0.0.1
mysql-test/mysql-test-run.sh:
  Use mysqladmin ping to test if server is up
mysql-test/r/rpl000015.result:
  Added sleep to make results repeatable
mysql-test/t/rpl000015.test:
  Added sleep to make results repeatable
mysql-test/t/rpl000016.test:
  Added sleep to make results repeatable
sql/sql_repl.cc:
  added DBUG entry
sql/sql_table.cc:
  Removed comparison of virtual functions as this didn't work on
  Compaq C++ on OSF1

Added timeouts to replication tests to handle concurrent inserts


Docs/manual.texi:
  Changelog
client/mysqlshow.c:
  Fix for new SHOW FULL COLUMNS syntax
mysql-test/r/show_check.result:
  Fix for SHOW FULL COLUMNS
mysql-test/t/alter_table.test:
  Fix for SHOW FULL COLUMNS
mysql-test/t/rpl000001.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000002.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000003.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000007.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000008.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000009.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000010.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000011.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000012.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000013.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000014.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000015.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/rpl000016.test:
  Added timeout to handle concurrent inserts.
mysql-test/t/select.test:
  Fix for SHOW FULL COLUMNS
mysql-test/t/show_check.test:
  Fix for SHOW FULL COLUMNS
mysql-test/t/type_blob.test:
  Fix for SHOW FULL COLUMNS
mysql-test/t/type_float.test:
  Fix for SHOW FULL COLUMNS
mysql-test/t/type_ranges.test:
  Fix for SHOW FULL COLUMNS
sql/mysql_priv.h:
  Fix for SHOW FULL COLUMNS
sql/sql_parse.cc:
  Fix for SHOW FULL COLUMNS
sql/sql_show.cc:
  Fix for SHOW FULL COLUMNS
sql/sql_yacc.yy:
  Fix for SHOW FULL COLUMNS

Docs/manual.texi:
  Changelog
mysql-test/mysql-test-run.sh:
  Added missing --user
sql/ha_berkeley.cc:
  Fixed bug in SHOW LOGS
sql/item_func.cc:
  Cleanup; Fixed possible problem with NULL
sql/mini_client.cc:
  cleanup
sql/slave.cc:
  Cleanup
sql/sql_repl.cc:
  Fixed timing problem where we could miss a broadcast
sql/sql_show.cc:
  Fixed bug in SHOW LOGS when there wasn't any log files

Don't convert field names in mysql_list_fields


Docs/manual.texi:
  Changelog
scripts/make_binary_distribution.sh:
  Fix typo
sql/sql_base.cc:
  Don't convert field names in mysql_list_fields()

scripts/make_binary_distribution.sh:
  Fixed some bugs that I had introduced in last push

Build-tools/Do-compile:
  Added binary suffix
  Stage are now names, not numbers
Build-tools/Do-patch-file:
  Changed to use unified diff
Build-tools/Do-rpm:
  Updated to new DBI/DBD versions
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/Makefile.am:
  Remove removed files

mysql-test/r/select.result:
  Fixed
sql/net_pkg.cc:
  Fixed typo

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  SCCS merged

Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE  tables to not use FILE


BitKeeper/deleted/.del-m.MRG~3f5632c37af00f18:
  Delete: mysql-test/std_data/m.MRG
BitKeeper/deleted/.del-m.frm~e351dfe0b6824c0c:
  Delete: mysql-test/std_data/m.frm
Docs/manual.texi:
  Added DNS section
configure.in:
  Update to 3.23.32
include/Makefile.am:
  Added my_config.h
include/mysql_com.h:
  Changes for --with-server-suffix
include/mysql_version.h.in:
  cleanup
merge/open.c:
  Don't use FILE
mysql-test/Makefile.am:
  removed not needed data files
mysql-test/r/merge.result:
  generate merge file
mysql-test/t/merge.test:
  generate merge file
sql-bench/Results/ATIS-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/create-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/select-mysql-NT_4.0:
  New benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  New benchmark results
sql/log.cc:
  Ensure that mutex are initialized before used
sql/log_event.h:
  Changes for --with-server-suffix
sql/mysql_priv.h:
  Changes for --with-server-suffix
sql/mysqlbinlog.cc:
  Changes for --with-server-suffix
sql/mysqld.cc:
  changed strnmov -> strmake
sql/net_pkg.cc:
  Prepare for adding char-set conversion to SHOW commands

Docs/manual.texi:
  edit recent change notes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


Docs/manual.texi:
  Auto merged

BitKeeper/deleted/.del-test_vsnprintf.c~e3d568aca62dc81e:
  Delete: mysys/test_vsnprintf.c

Docs/manual.texi:
  updates for 3.23.32
configure.in:
  new version

  Fixed a small bug.. comment was being overwritten.
Docs/Support/test-make-manual
  Will now fix it's own dependencies.. includes checking out files
  and creating it's own include.texi.


Docs/Makefile.am:
  Fixed small bug, comment was not being included. ;)
Docs/Support/test-make-manual:
  test-make-manual will now fix it's own dependencies.
  This is useful for those of us who don't have all files in the
  repository checked out all the time.

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

    added send/reap/dirty_close
include/mysql.h
    mysql_send_query()/mysql_reap_query()
libmysql/libmysql.c
    mysql_send_query()/mysql_reap_query()
mysys/my_vsnprintf.c
    fixed critical bug that codedumped when connection aborted
sql/sql_parse.cc
    0
mysql-test/r/dirty-close.result
    New BitKeeper file ``mysql-test/r/dirty-close.result''
mysql-test/t/dirty-close.test
    New BitKeeper file ``mysql-test/t/dirty-close.test''



client/mysqltest.c:
  added send/reap/dirty_close
include/mysql.h:
  mysql_send_query()/mysql_reap_query()
libmysql/libmysql.c:
  mysql_send_query()/mysql_reap_query()
mysys/my_vsnprintf.c:
  fixed critical bug that codedumped when connection aborted
sql/sql_parse.cc:
  0

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

mysql-test/t/rpl000001.test:
  added test for replicaion of set password
sql/sql_acl.cc:
  fixed coredump on slave in the case of SET PASSWORD

ha_myisam.h	magic removed


sql/ha_myisam.h:
  magic removed
sql/ha_myisam.cc:
  magic removed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

Fixed bug in TRIM
changed strnmov -> strmake


BUILD/SETUP.sh:
  Removed --disable-shared
Docs/manual.texi:
  Changelog
  Installing many servers
acinclude.m4:
  Force use of db-3.2.3h
client/mysql.cc:
  cleanup
mysql-test/r/func_str.result:
  Added new TRIM test
mysql-test/t/func_str.test:
  Added new TRIM test
mysys/charset.c:
  change to use strmake instead of strnmov
mysys/mf_format.c:
  change to use strmake instead of strnmov
mysys/mf_tempfile.c:
  change to use strmake instead of strnmov
scripts/make_binary_distribution.sh:
  Removed error messages for missing files
sql/handler.cc:
  More debug
sql/item_strfunc.cc:
  Fixed bug in TRIM()
sql/mysqld.cc:
  Added MYSQL_SERVER_SUFFIX to mysqld

into cane.mysql.fi:/usr/home/tim/my/work

configure.in:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
include/mysql_version.h.in:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
myisam/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
mysql-test/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
scripts/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
scripts/mysqlbug.sh:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
sql-bench/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
sql/mysqld.cc:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)
support-files/Makefile.am:
  add --with-server-suffix (MYSQL_SERVER_SUFFIX)

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

fixes for restore table
test case for backup/restore


extra/resolve_stack_dump.c:
  fixed buffer overrun
mysql-test/t/rpl000004.test:
  updated load table from master test case
sql/ha_myisam.cc:
  verbose error messages during backup table, very silent repair on restore
sql/sql_table.cc:
  fixed bugs in restore table

into cane.mysql.fi:/usr/home/tim/my/work


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Change wording, because 3.23 is stable now

    merged continued
mysql-test/t/rpl000004.test
    added a test for am empty table
mysql-test/r/rpl000004.result
    New BitKeeper file ``mysql-test/r/rpl000004.result''


client/mysqltest.c:
  merged continued
mysql-test/t/rpl000004.test:
  added a test for am empty table

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


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Removed mirror in Australia.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

manual mode


mysql-test/mysql-test-run.sh:
  Auto merged
sql/lex.h:
  Auto merged
Docs/manual.texi:
  merged
client/mysqltest.c:
  merged