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

Docs/manual.texi:
  Updated book.

Docs/manual.texi:
  replications updates

Docs/manual.texi:
  Mirror maintanence. Fixed texinfo errors.

Minor corrections to patch.


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

rpl000001.result	BitKeeper file /home/sasha/src/bk/mysql/mysql-test/r/rpl000001.result
ignore  	Added BitKeeper/tmp/bkr3sAHD to the ignore list
slave.h 	MASTER_POS_WAIT
lex.h   	MASTER_POS_WAIT
slave.cc	MASTER_POS_WAIT, do automagic restart on debugging abort, skip rotate events in 
slave.cc	debug abort count
sql_repl.cc	announce the log name at the start of the log with a fake rotate event
item_create.h	MASTER_POS_WAIT
item_func.cc	MASTER_POS_WAIT
item_func.h	MASTER_POS_WAIT
sql_class.h	enter_cond(), exit_cond() helper inliners
item_create.cc	added MASTER_POS_WAIT
mysql-test-run.sh	speed improvement fixes
rpl000007.test	sync
rpl000003.test	sleep -> sync
rpl000004.test	sleep -> sync, fixed clean up bug
rpl000014.test	sync
rpl000009.test	sync
rpl000013.test	sync
rpl000001.test	sleep -> sync
rpl000008.test	sync
rpl000006.test	sync on cleanup
rpl000011.test	sync
rpl000012.test	sync
rpl000005.test	sleep -> sync
rpl000010.test	sync
rpl000015.test	sync
rpl000002.test	sleep -> sync
rpl000014.result	we now know the master log name as soon as we connect
mysql.cc	added optional agrument to --wait
mysqltest.c	added save_master_pos and sync_with_master commands


client/mysql.cc:
  added optional agrument to --wait
client/mysqltest.c:
  added save_master_pos and sync_with_master commands
mysql-test/mysql-test-run.sh:
  speed improvement fixes
mysql-test/r/rpl000014.result:
  we now know the master log name as soon as we connect
mysql-test/t/rpl000001.test:
  sleep -> sync
mysql-test/t/rpl000002.test:
  sleep -> sync
mysql-test/t/rpl000003.test:
  sleep -> sync
mysql-test/t/rpl000004.test:
  sleep -> sync, fixed clean up bug
mysql-test/t/rpl000005.test:
  sleep -> sync
mysql-test/t/rpl000006.test:
  sync on cleanup
mysql-test/t/rpl000007.test:
  sync
mysql-test/t/rpl000008.test:
  sync
mysql-test/t/rpl000009.test:
  sync
mysql-test/t/rpl000010.test:
  sync
mysql-test/t/rpl000011.test:
  sync
mysql-test/t/rpl000012.test:
  sync
mysql-test/t/rpl000013.test:
  sync
mysql-test/t/rpl000014.test:
  sync
mysql-test/t/rpl000015.test:
  sync
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/bkr3sAHD to the ignore list
mysql-test/t/rpl000016.test:
  sync
sql/item_create.cc:
  added MASTER_POS_WAIT
sql/item_create.h:
  MASTER_POS_WAIT
sql/item_func.cc:
  MASTER_POS_WAIT
sql/item_func.h:
  MASTER_POS_WAIT
sql/lex.h:
  MASTER_POS_WAIT
sql/slave.cc:
  MASTER_POS_WAIT, do automagic restart on debugging abort, skip rotate events in 
  debug abort count
sql/slave.h:
  MASTER_POS_WAIT
sql/sql_class.h:
  enter_cond(), exit_cond() helper inliners
sql/sql_repl.cc:
  announce the log name at the start of the log with a fake rotate event

Docs/manual.texi:
  Changelog

configure.in:
  top_srcdir -> top_builddir

Fixed bug with HEAP tables on windows
Fixed bug with HAVING on empty tables


Docs/manual.texi:
  Update of UDF functions
mysql-test/mysql-test-run.sh:
  Added option --user
mysql-test/r/bdb.result:
  Added more test to get better coverage
mysql-test/t/bdb.test:
  Added more test to get better coverage
sql/field.cc:
  Fixes for key packing in BDB
sql/field.h:
  Fixes for key packing in BDB
sql/ha_berkeley.cc:
  Fixed for bugs that was found when getting full code coverage
sql/ha_heap.cc:
  Fixed problem with HEAP tables on windows
sql/log.cc:
  Safety fix
sql/sql_select.cc:
  Fixed bug with HAVING on empty tables
sql/table.cc:
  Fixed problem with HEAP tables on windows

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

use the default charset instead of failing.

Fix a typo in BDB configuration.


acinclude.m4:
  Fix typo (missing "test")
configure.in:
  Handle AVAILABLE_LANGUAGES more portably.
sql/share/Makefile.am:
  Handle AVAILABLE_LANGUAGES more portably.

Added keyword MEDIUM to CHECK TABLE
New benchmarks results for Linux-alpha


BitKeeper/deleted/.del-READ-ME~ed6c5184d4bf6b7c:
  Delete: strings/READ-ME
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.13_SMP_alpha~21ddf9425cbdd58:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.13_SMP_alpha~583091e05a25fb6:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.13_SMP_alpha~6c20c9ef46f82241:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.13_SMP_alpha~e8cc899bb933532f:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.13_SMP_alpha~84df7c6446e51e26:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-create-mysql-Linux_2.2.13_SMP_alpha~2c9af91e9771f618:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.13_SMP_alpha~688809eb8ea77b3d:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-select-mysql-Linux_2.2.13_SMP_alpha~db59425a7f4aa93f:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.13_SMP_alpha~fc410754151d622c:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha
Docs/manual.texi:
  Updated ChangeLog
myisam/mi_close.c:
  Force write of crashed flag on close
myisam/mi_info.c:
  Fixed that mean_reclength works for big files
mysql-test/r/show_check.result:
  Added test of CHECK TABLE ... MEDIUM
mysql-test/t/show_check.test:
  Added test of CHECK TABLE ... MEDIUM
sql/ha_myisam.cc:
  Fixed that CHECK TABLE .. EXTENDED works properly
  Cleared the CRASHED flag on repair
sql/lex.h:
  Added keyword MEDIUM
sql/sql_yacc.yy:
  Added CHECK TABLE .. MEDIUM