into light.local:/home/miguel/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union

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

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


mysql-test/r/type_float.result:
  Auto merged

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

mysql-test/r/type_float.result:
  fixed test result

BitKeeper/triggers/post-incoming:
  Change mode to -rwxrwxr-x

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

added debugging options to master to behave sporadically, and a 
test case to make sure the slave can deal with it


BitKeeper/triggers/post-commit:
  fixed message
sql/mysqld.cc:
  added debugging options to force the master to occasionally break
  replication
sql/slave.cc:
  cosmetic change to improve readability
sql/sql_repl.cc:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events

sql/ha_innobase.cc:
  Update possible row timestamp column also in an update

Docs/manual.texi:
  Auto merged

myisam/myisamchk.c:
  --force now implices --update
sql/share/italian/errmsg.txt:
  Update of error messages

Docs/manual.texi:
  add LIKE example illustrating case sensitivity.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/mysqld.cc:
  Put OPT_INNODB_UNIX_FILE_FLUSH_METHOD to mysqld.cc enum type

sync0sync.ic	Do not use GCC in-line assembly
srv0start.h	Eliminate a deadlock of threads at startup
buf0buf.h	Add some debug functions
srv0start.c	Remove a printf


innobase/srv/srv0start.c:
  Remove a printf
innobase/include/buf0buf.h:
  Add some debug functions
innobase/include/srv0start.h:
  Eliminate a deadlock of threads at startup
innobase/include/sync0sync.ic:
  Do not use GCC in-line assembly
innobase/include/univ.i:
  Added a new debug define option

srv0start.c	Eliminate a deadlock of threads at startup
row0mysql.c	Several bug fixes
row0umod.c	Several bug fixes
row0upd.c	Several bug fixes
os0file.c	Revert back to fsync as default flush method
log0recv.c	Several bug fixes
ibuf0ibuf.c	Several bug fixes
fsp0fsp.c	Several bug fixes
trx0undo.c	Put some assertions to uncover possible bugs
dict0boot.c	Several bug fixes


innobase/dict/dict0boot.c:
  Several bug fixes
innobase/trx/trx0undo.c:
  Put some assertions to uncover possible bugs
innobase/fsp/fsp0fsp.c:
  Several bug fixes
innobase/ibuf/ibuf0ibuf.c:
  Several bug fixes
innobase/log/log0recv.c:
  Several bug fixes
innobase/os/os0file.c:
  Revert back to fsync as default flush method
innobase/row/row0mysql.c:
  Several bug fixes
innobase/row/row0umod.c:
  Several bug fixes
innobase/row/row0upd.c:
  Several bug fixes
innobase/srv/srv0start.c:
  Eliminate a deadlock of threads at startup
innobase/sync/sync0sync.c:
  Do not use in-line assembly in GCC

buf0flu.c	Several bug fixes
buf0rea.c	Several bug fixes
buf0lru.c	Clearer error message


innobase/buf/buf0lru.c:
  Clearer error message
innobase/buf/buf0buf.c:
  Several bug fixes
innobase/buf/buf0flu.c:
  Several bug fixes
innobase/buf/buf0rea.c:
  Several bug fixes

into donna.mysql.fi:/home/heikki/mysqlf

btr0pcur.c	Fix a bug in persistent cursor restoration: this could cause crashes especially if the buffer pool is small


innobase/btr/btr0pcur.c:
  Fix a bug in persistent cursor restoration: this could cause crashes especially if the buffer pool is small

Docs/manual.texi:
  Updated mirror URL

mysql-test/r/drop.result:
  merged a test from 4.0
mysql-test/t/drop.test:
  updated test results

preserve originating server id in Intvar events to avoid inifinite loops


include/mysqld_error.h:
  new error messages
mysql-test/r/drop.result:
  updated result
mysql-test/r/flush.result:
  updated result
mysql-test/t/drop.test:
  test for proper handling of drop/create database when holding
  global read lock
mysql-test/t/flush.test:
  test to see if other thread would block on drop database if we
  are holding global read lock
sql/log.cc:
  preserve originating server id in Intvar log event
sql/share/czech/errmsg.txt:
  new error messages
sql/share/danish/errmsg.txt:
  new error messages
sql/share/dutch/errmsg.txt:
  new error messages
sql/share/english/errmsg.txt:
  new error messages
sql/share/estonian/errmsg.txt:
  new error messages
sql/share/french/errmsg.txt:
  new error messages
sql/share/german/errmsg.txt:
  new error messages
sql/share/greek/errmsg.txt:
  new error messages
sql/share/hungarian/errmsg.txt:
  new error messages
sql/share/italian/errmsg.txt:
  new error messages
sql/share/japanese/errmsg.txt:
  new error messages
sql/share/korean/errmsg.txt:
  new error messages
sql/share/norwegian-ny/errmsg.txt:
  new error messages
sql/share/norwegian/errmsg.txt:
  new error messages
sql/share/polish/errmsg.txt:
  new error messages
sql/share/portuguese/errmsg.txt:
  new error messages
sql/share/romanian/errmsg.txt:
  new error messages
sql/share/russian/errmsg.txt:
  new error messages
sql/share/slovak/errmsg.txt:
  new error messages
sql/share/spanish/errmsg.txt:
  new error messages
sql/share/swedish/errmsg.txt:
  new error messages
sql/slave.cc:
  fixed typo in comment
sql/sql_db.cc:
  global read lock should block drop/create database

Docs/manual.texi:
  Changelog
mysql-test/r/show_check.result:
  Added test for SHOW CREATE
mysql-test/t/show_check.test:
  Added test for SHOW CREATE
sql/mysqld.cc:
  Fixed messages

Docs/manual.texi:
  Changelog
sql/mysql_priv.h:
  Added --warnings
sql/mysqld.cc:
  Added --warnings
sql/sql_parse.cc:
  Added --warnings

into donna.mysql.fi:/home/heikki/mysqlf

innobase/fsp/fsp0fsp.c:
  Fix a bug in freeing of a segment in the tablespace

Docs/manual.texi:
  Auto merged

Fixed problem when converting bigint to double.
Fixed bug in count(distinct null)
Fixed bug with empty BDB tables.


BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~dd306b2e583ebde4:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~11038a44f73070e7:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~662b96bc66bc91b6:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~788ad492867b1226:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~5316add301edb60:
  Delete: sql-bench/Results/connect-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~26e09af61f88d8c9:
  Delete: sql-bench/Results/create-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~fd2699adb3190d07:
  Delete: sql-bench/Results/insert-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~b01175ad38fd12b6:
  Delete: sql-bench/Results/select-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg~8ba598d217450157:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686-cmp-mysql,pg
Docs/manual.texi:
  Changelog + update to Linux section
client/mysqlcheck.c:
  Fixed bug when using --fast
  --check --auto-repair --fast will not anymore repair tables that
  had warnings but where ok.
mysql-test/r/bdb.result:
  New test case
mysql-test/r/bigint.result:
  New test case
mysql-test/r/count_distinct.result:
  New test case
mysql-test/t/bdb.test:
  New test case
mysql-test/t/bigint.test:
  New test case
mysql-test/t/count_distinct.test:
  New test case
sql-bench/Comments/postgres.benchmark:
  Update for PostgreSQL 7.1.2
sql-bench/graph-compare-results.sh:
  Fixed colors for mysql --fast tests
sql/field.cc:
  Fixed problem when converting bigint to double.
sql/item_sum.cc:
  Fixed bug in count(distinct null)
sql/item_sum.h:
  Fixed bug in count(distinct null)
sql/mysqlbinlog.cc:
  Fixed typo
sql/sql_base.cc:
  cleanup
sql/sql_select.cc:
  Fixed bug with empty BDB tables.
sql/time.cc:
  Removed warning when reading timestamps with sub seconds.

manual.texi	ALTER TABLE clarification


Docs/manual.texi:
  $tab -> @tab

into teton.kitebird.com:/home/paul/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  release note cleanups

Docs/manual.texi:
  Corrected all occurances of license.htmy

manual.texi	Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
mysqld.cc	Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39


sql/mysqld.cc:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39
Docs/manual.texi:
  Had to revert name back to innodb_unix_file_flush_method because one line in mysqld.cc was not changed in 3.23.39

Docs/manual.texi:
  Added hyperlink tags to InnoDB contact info

innobase/row/row0mysql.c:
  Include rem0cmp.h to compile on Windows, on Unix it is for some reason included

Docs/manual.texi:
  Any server can be installed as a service under NT