Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Changed TCX -> MySQL AB
configure.in:
  New version
include/my_sys.h:
  Fixes for OS2
ltconfig:
  Fixes for OS2
ltmain.sh:
  Fixes for OS2
mit-pthreads/net/net_internal.h:
  Fixes for OPENBSD
mit-pthreads/net/proto_internal.h:
  Fixes for OPENBSD
mit-pthreads/net/res_internal.h:
  Fixes for OPENBSD
mit-pthreads/net/serv_internal.h:
  Fixes for OPENBSD
myisammrg/myrg_open.c:
  MERGE didn't work on Windows
mysys/my_getwd.c:
  Fixes for OS2
sql/field.cc:
  cleanup
sql/field.h:
  Fix for new SCO compiler
sql/ha_berkeley.cc:
  Cleanup
sql/ha_berkeley.h:
  Portability fix
sql/item_sum.h:
  Fix for new SCO compiler
sql/log.cc:
  Fixes for OS2
sql/log_event.h:
  Fixes for OS2
sql/mysqld.cc:
  Fixes for OS2
sql/net_serv.cc:
  Fixes for OS2
sql/sql_analyse.h:
  Fix for new SCO compiler
sql/sql_class.h:
  Fix for new SCO compiler
sql/sql_map.h:
  Fix for new SCO compiler
sql/sql_repl.cc:
  cleanup
sql/sql_string.h:
  Fix for new SCO compiler
sql/sql_table.cc:
  cleanup
strings/longlong2str-x86.s:
  Fixes for openbsd

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


Docs/manual.texi:
  Auto merged

    updates for new code
sql/mysqld.cc
    catch SIGBUS and SIGILL
    print query and connection id on coredump if possible


Docs/manual.texi:
  updates for new code
sql/mysqld.cc:
  catch SIGBUS and SIGILL
  print query and connection id on coredump if possible

Docs/manual.texi:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

Changed 'static inline' to 'inline' for SCO new's compiler


Docs/manual.texi:
  Lots of changes in "Debugging a MySQL server" and in Log files handling
mysys/hash.c:
  Changed 'static inline' to 'inline'
sql/hostname.cc:
  Changed 'static inline' to 'inline'
sql/item.cc:
  Changed 'static inline' to 'inline'
sql/net_serv.cc:
  Changed 'static inline' to 'inline'
sql/password.c:
  Changed 'static inline' to 'inline'
sql/slave.cc:
  Changed 'static inline' to 'inline'
sql/sql_acl.cc:
  Changed 'static inline' to 'inline'
sql/sql_base.cc:
  Changed mysql_list_field() to convert field names again
sql/sql_parse.cc:
  Changed 'static inline' to 'inline'
sql/sql_repl.cc:
  fixed typo

fixed sync bugs in three test cases
added offset argument to sync_with_master to mysqltest to be able to fix sync bugs
added a test case for slave startup with existing master.info
expanded mysql-test-run.sh to be able to run pre-start shell script initializations


client/mysqltest.c:
  added offset argument to sync_with_master
mysql-test/mysql-test-run.sh:
  added option to run master or slave initialization shell script
mysql-test/r/rpl000016.result:
  fixed bug in test case
mysql-test/t/rpl000012.test:
  fixed syncronization bug
mysql-test/t/rpl000013.test:
  fixed sync bug
mysql-test/t/rpl000016.test:
  fixed ambiguous show slave status.
sql/slave.cc:
  fixed bug that broke slave server start with existing master.info,
  Monty's optimization was not chopping off newline from logname.

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

slave will skip the first SQL_SLAVE_SKIP_COUNTER events on start - 
this is needed to recover from broken replication when the next log
event(s) should just be skipped.
Rotate binlogs when max_binlog_size is reached


include/my_sys.h:
  added my_snprintf()
include/mysqld_error.h:
  more error messages
mysql-test/r/rpl000014.result:
  updated results for new SHOW SLAVE STATUS format
mysql-test/r/rpl000015.result:
  update for SHOW SLAVE STATUS
mysql-test/r/rpl000016.result:
  update for additions to the test
mysql-test/t/rpl000016.test:
  test max_binlog_size and slave_skip_counter
mysys/my_vsnprintf.c:
  added my_snprintf()
sql/gen_lex_hash.cc:
  old values could not do it
sql/lex.h:
  updates for SQL_SLAVE_SKIP_COUNTER
sql/log.cc:
  rotate binlogs when max_binlog_size is reached
sql/mysqld.cc:
  added max_binlog_size
sql/share/czech/errmsg.txt:
  new errors
sql/share/danish/errmsg.txt:
  new errors
sql/share/dutch/errmsg.txt:
  new errors
sql/share/english/errmsg.txt:
  new errors
sql/share/estonian/errmsg.txt:
  new errors
sql/share/french/errmsg.txt:
  new errors
sql/share/german/errmsg.txt:
  new errors
sql/share/greek/errmsg.txt:
  new errors
sql/share/hungarian/errmsg.txt:
  new errors
sql/share/italian/errmsg.txt:
  new errors
sql/share/japanese/errmsg.txt:
  new errors
sql/share/korean/errmsg.txt:
  new errors
sql/share/norwegian-ny/errmsg.txt:
  new errors
sql/share/norwegian/errmsg.txt:
  new errors
sql/share/polish/errmsg.txt:
  new errors
sql/share/portuguese/errmsg.txt:
  new errors
sql/share/romanian/errmsg.txt:
  new errors
sql/share/russian/errmsg.txt:
  new errors, translated untranslated messages
sql/share/slovak/errmsg.txt:
  new errors
sql/share/spanish/errmsg.txt:
  new errors
sql/share/swedish/errmsg.txt:
  new errors
sql/slave.cc:
  updates for slave_skip_counter and extension to show slave status
sql/slave.h:
  slave_skip_counter
sql/sql_repl.cc:
  use error messages from errmsg.txt
sql/sql_yacc.yy:
  skip_slave_counter

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql

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

client/mysqltest.c:
  fixed bug in reap command
mysql-test/r/backup.result:
  update to backup test
mysql-test/t/backup.test:
  test to see if lock tables /unlock tables will cause a problem
mysql-test/t/rpl000016.test:
  fixed syncronization problem between master and slave

mysys/mf_tempfile.c:
  Corrected misnamed DBUG_ENTER

Docs/manual.texi:
  clean up recent change notes

Added free of io_cache when using ALTER TABLE ... ORDER BY


Docs/manual.texi:
  Updated from user comments
sql/ha_berkeley.cc:
  Fixed wrong cast
sql/hostname.cc:
  Added new mutex for hostname lookup
sql/sql_table.cc:
  Added free of io_cache when using ALTER TABLE ... ORDER BY

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

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