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

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

    cleanup - remove unneeded daeamon restarts
sql/log_event.cc
    fixed bug - do not confuse confused slaves even further if they try to 
    read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc
    give error if constructor fails
sql/mysqld.cc
    --disconnect-slave-event-count for replication debugging
sql/slave.cc
    --disconnect-slave-event-count
    cleanup to remove unneeded sleeps when things go wrong - sleep only 
    when we have to
sql/slave.h
    --disconnect-slave-event-count

test cases for ALTER TABLE ORDER BY and replication offset off by 22 
confusion mystery bug (both pass)


mysql-test/mysql-test-run:
  cleanup - remove unneeded daeamon restarts
sql/log_event.cc:
  fixed bug - do not confuse confused slaves even further if they try to 
  read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc:
  give error if constructor fails
sql/mysqld.cc:
  --disconnect-slave-event-count for replication debugging
sql/slave.cc:
  --disconnect-slave-event-count
  cleanup to remove unneeded sleeps when things go wrong - sleep only 
  when we have to
sql/slave.h:
  --disconnect-slave-event-count
sql/sql_repl.cc:
  added unknown error

Fixes for Windows


Docs/manual.texi:
  Added things to the Windows section
client/mysql.cc:
  Fixes to get Jani's changes to work on Windows
include/myisam.h:
  Added chk_status()
include/mysqld_error.h:
  Split error message for crashed table to 3 different error messages
myisam/mi_check.c:
  Added chk_status()
myisam/myisamchk.c:
  Added chk_status(). This gives us better error messages when the
  table is marked as 'crashed'
sql/ha_myisam.cc:
  Better error messages if the table is marked as crashed
sql/handler.cc:
  Better error messages if the table is marked as crashed
sql/share/czech/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/czech/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/danish/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/danish/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/dutch/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/dutch/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/english/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/english/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/estonian/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/estonian/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/french/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/french/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/german/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/german/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/greek/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/greek/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/hungarian/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/hungarian/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/italian/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/italian/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/japanese/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/japanese/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/korean/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/korean/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/norwegian-ny/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/norwegian/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/polish/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/polish/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/portuguese/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/portuguese/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/romanian/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/russian/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/russian/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/slovak/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/slovak/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/spanish/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/spanish/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/share/swedish/errmsg.OLD:
  Better error messages if the table is marked as crashed
sql/share/swedish/errmsg.sys:
  Better error messages if the table is marked as crashed
sql/share/swedish/errmsg.txt:
  Better error messages if the table is marked as crashed
sql/sql_table.cc:
  Fix for gcc 2.7.2

    generate a bigger reject file ( full in most cases) if the master result file is 0 length
sql/sql_show.cc
    fixed 3 bugs in SHOW CREATE TABLE

New test case shw000001 for SHOW CREATE TABLE bugs


BitKeeper/etc/ignore:
  Added BitKeeper/tmp/bkOF1wtJ scripts/mysqldumpslow to the ignore list
client/mysqltest.c:
  generate a bigger reject file ( full in most cases) if the master result file is 0 length
sql/sql_show.cc:
  fixed 3 bugs in SHOW CREATE TABLE

Docs/manual.texi:
  Added some general links
mysys/Makefile.am:
  Fixed compilation of test_thr_lock in another directory
sql/table.cc:
  cleanup

.del-README~df5481fdbe6e5b6e	Delete: mysql-test/var/log/README
.del-README~acb305e4c2ed5990	Delete: mysql-test/var/run/README
.del-README~b32d866bfd50e72e	Delete: mysql-test/var/tmp/README


BitKeeper/deleted/.del-README~3b652c0f321e1940:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~acb305e4c2ed5990:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~b32d866bfd50e72e:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~df5481fdbe6e5b6e:
  ***MISSING WEAVE***

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

added gdb support, mysqld options per test, and other cool stuff to mysql-test-run
added --replicate-wild-do/ignore-table
more test cases


client/mysqltest.c:
  fixed a reject file bug
mysql-test/mysql-test-run:
  support for gdb and running only one test case
sql/mysql_priv.h:
  wild_compare needs to be global
sql/mysqld.cc:
  --replicate-wild-do/ignore-table
sql/slave.cc:
  wild,wild
sql/slave.h:
  wild fixes
sql/sql_class.cc:
  fixed compiler warning
sql/sql_string.cc:
  wild stuff needs to be global
BitKeeper/etc/ignore:
  Added BitKeeper/tmp/gone mysql-test/r/3.23/rpl mysql-test/r/3.23/rpl.reject mysql-test/var/lib/bar/bar.frm mysql-test/var/lib/bar/bar.MYD mysql-test/var/lib/bar/bar.MYI mysql-test/var/lib/foo/foo.frm mysql-test/var/lib/foo/foo.MYD mysql-test/var/lib/foo/foo.MYI mysql-test/var/lib/test/bar.frm mysql-test/var/lib/test/bar.MYD mysql-test/var/lib/test/bar.MYI mysql-test/var/lib/test/choo.frm mysql-test/var/lib/test/choo.MYD mysql-test/var/lib/test/choo.MYI mysql-test/var/slave-data/bar/bar.frm mysql-test/var/slave-data/bar/bar.MYD mysql-test/var/slave-data/bar/bar.MYI mysql-test/var/slave-data/foo/foo.frm mysql-test/var/slave-data/foo/foo.MYD mysql-test/var/slave-data/foo/foo.MYI mysql-test/var/slave-data/test/bar.frm mysql-test/var/slave-data/test/bar.MYD mysql-test/var/slave-data/test/bar.MYI mysql-test/var/slave-data/test/choo.frm mysql-test/var/slave-data/test/choo.MYD mysql-test/var/slave-data/test/choo.MYI mysql-test/var/tmp/README to the ignore list

Docs/manual.texi:
  Auto merged

Fixed bug in ISAM and MyISAM when updating from multiple-processes


Docs/manual.texi:
  Updated changelog
client/mysqladmin.c:
  Upgraded version number because the change of llstr() is visible
extra/perror.c:
  Added new error message
include/my_base.h:
  Added HA_ERR_CRASHED_ON_USAGE
isam/rnext.c:
  Fixed bug when updating from multiple-processes
isam/rprev.c:
  Fixed bug when updating from multiple-processes
libmysql/libmysql.c:
  Fixed that mysql->options.client_flag was used properly
myisam/mi_locking.c:
  Fixed bug when updating from multiple-processes
myisam/mi_open.c:
  Fixed bug when updating from multiple-processes
  Added HA_ERR_CRASHED_ON_USAGE
myisam/mi_rnext.c:
  Fixed bug when updating from multiple-processes
myisam/mi_rprev.c:
  Fixed bug when updating from multiple-processes
myisam/myisamchk.c:
  Added HA_ERR_CRASHED_ON_USAGE
sql/sql_base.cc:
  Fixed problem with auto-repair of MyISAM tables
sql/table.cc:
  Fixed problem with auto-repair of MyISAM tables

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Updated changelog
mysys/thr_lock.c:
  Fixed bad performance bug when using SELECT, INSERT and UPDATE
strings/llstr.c:
  change llstr() to output signed strings

Docs/manual.texi:
  Added documentation about new pager and tee features in mysql
  client. Added an example about the vertical output.
client/mysql.cc:
  Small documentation changes.

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

client/mysql.cc:
  Small change in code, not even a bug fix.

client/mysql.cc:
  Fixed a bug with tee function for Windows version of mysql
  client.

Docs/manual.texi:
  Howard's grammar changes

sql/sql_parse.cc:
  Auto merged

Docs/manual.texi:
  Split BDB into different sections
  Added MySQL developers section
  Changed an SQL to a SQL
include/my_sys.h:
  More statistic variables
libmysql/libmysql.c:
  Added option "interactive-timeout"
mysys/mf_tempfile.c:
  More statistic variables
mysys/my_static.c:
  More statistic variables
sql-bench/crash-me.sh:
  Fixed bug in truncate table test
sql-bench/limits/mysql-3.23.cfg:
  Updated to crash-me 1.51
sql-bench/limits/mysql.cfg:
  Updated to crash-me 1.51
sql/filesort.cc:
  More statistics
sql/mysql_priv.h:
  More statistics
sql/mysqld.cc:
  More statistics
sql/sql_base.cc:
  Fix for NATURAL JOIN
sql/sql_delete.cc:
  cleanup + Added logging if one doesn't use index
sql/sql_parse.cc:
  Logging if one doesn't use index
sql/sql_select.cc:
  Logging if one doesn't use index
sql/sql_update.cc:
  cleanup + Added logging if one doesn't use index
sql/structs.h:
  Fix for NATURAL JOIN
support-files/my-huge.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]
support-files/my-large.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]
support-files/my-medium.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]
support-files/my-small.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]

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


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into threads.polyesthetic.msg:/usr/local/src/my/work

  - set pid_file and err_log relative to DATADIR as specified in
    the my.cnf file, instead of the default value
  - do not pass safe_mysqld-specific options to mysqld
  - minor style changes (remove extra ; at end of line, make
    spacing more consistent, etc.)

manual.ja.texi
  - Turn off SCCS flag


Docs/manual.ja.texi:
  Turn off SCCS flag
scripts/safe_mysqld.sh:
  - set pid_file and err_log relative to DATADIR
    as specified in the my.cnf file, instead of
    the default value
  - do not pass safe_mysqld-specific options to
    mysqld
  - minor style changes (remove extra ; at end of
    line, make spacing more consistent, etc.)

BUILD/compile-alpha-cxx:
  Building on Alpha with Compaq C and C+++
Docs/manual.texi:
  Changelogs and update of links
myisam/mi_key.c:
  Fixed multi_part keys where first part where of TEXT/BLOB type
mysys/Makefile.am:
  Makefile.am now works with Compaq make
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/test-select.sh:
  Made the count_distinct_big test a bit smaller
sql/log.cc:
  Changed the slow log format to have more information by default
sql/mysqld.cc:
  false->FALSE
sql/share/german/errmsg.sys:
  Update of messages
sql/share/german/errmsg.txt:
  Update of messages
sql/sql_base.cc:
  Fixed SELECT DISTINCT *
sql/sql_insert.cc:
  Cleanup
sql/sql_table.cc:
  Added logging of DROP of temporary tables
vio/VioFd.cc:
  false -> FALSE
vio/VioSSL.cc:
  false -> FALSE
vio/VioSSLFactoriesFd.cc:
  false -> FALSE
vio/VioSocket.cc:
  false -> FALSE

client/mysql.cc:
  Added corresponding 'tee_putc' function for putchar. This fixed
  a bug with outputs with --html and batch mode.

client/mysql.cc:
  Auto merged

sql/slave.cc:
  mi->pending needed a reset in one more place

fixed bugs in delayed insert replication and when slave loses connection after Int_var but before Query
public test suite now tests replication code as well


mysql-test/mybin/mysql-test_install_db:
  fixes to test replication with two daemons on one machine
mysql-test/mysql-test-run:
  fixes for replication tests -- still need to test gcov, the rest works
mysql-test/t/include/master-slave.inc:
  include file for replication tests
sql/slave.cc:
  fixed bug for the case when the slave loses connection after it has read Int_var event but before Query
sql/sql_insert.cc:
  reset error in delayed thread
  slave converts delayed insert to regular