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

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/ignore:
  added mysys/test_dir

Docs/manual.texi:
  Updated replication section
mysql-test/r/null_key.result:
  Added test UPDATE/DELETE with IS NULL on unique key
mysql-test/t/null_key.test:
  Added test UPDATE/DELETE with IS NULL on unique key
mysys/Makefile.am:
  Removed -f from $CP as this is not portable
  Fixed rule for testhash
sql/field.cc:
  Safety fix
sql/opt_range.cc:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
sql/opt_range.h:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL

    make table delay key write to speed things up a bit


mysql-test/t/bench_count_distinct.test:
  make table delay key write to speed things up a bit

added a benchmark test for count(distinct)


mysql-test/mysql-test-run.sh:
  u

ignore generated files from bdb


BitKeeper/etc/ignore:
  Added bdb/dist/template/rec_btree bdb/dist/template/rec_crdel bdb/dist/template/rec_db bdb/dist/template/rec_hash bdb/dist/template/rec_log bdb/dist/template/rec_qam bdb/dist/template/rec_txn bdb/hash/hash_auto.c bdb/include/btree_auto.h bdb/include/crdel_auto.h bdb/include/db_auto.h bdb/include/db_server.h bdb/include/hash_auto.h bdb/include/log_auto.h bdb/include/qam_auto.h bdb/include/txn_auto.h bdb/java/src/com/sleepycat/db/DbConstants.java bdb/log/log_auto.c bdb/qam/qam_auto.c bdb/rpc_client/db_server_clnt.c bdb/rpc_client/gen_client.c bdb/rpc_server/db_server_svc.c bdb/rpc_server/db_server_xdr.c bdb/rpc_server/gen_db_server.c bdb/test/include.tcl bdb/txn/txn_auto.c gmon.out mysql-test/gmon.out sql/gmon.out sql/share/charsets/gmon.out sql/share/gmon.out to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.


BitKeeper/deleted/.del-df_crash.result~4a3dbee64843953d:
  Delete: mysql-test/r/df_crash.result
BitKeeper/deleted/.del-df_crash.test~4c365178fe437f6:
  Delete: mysql-test/t/df_crash.test
Docs/manual.texi:
  Changelog
innobase/ib_config.h.in:
  automatic changed file
innobase/ib_config.h:
  automatic changed file
mysql-test/r/func_time.result:
  Test case for bug in time functions
mysql-test/r/innobase.result:
  Test for INSERT DELAYED
mysql-test/t/func_time.test:
  Test case for bug in time functions
mysql-test/t/innobase.test:
  Test for INSERT DELAYED
scripts/mysql_convert_table_format.sh:
  Added --socket and --port
sql/ha_innobase.cc:
  Fix bug when compiling with SAFE_MUTEX
  Cleaner comment when using SHOW TABLE STATUS
sql/mysqld.cc:
  Fix for shutdown on NT
sql/sql_insert.cc:
  Fixed problem with Innobase and INSERT DELAYED
sql/sql_udf.cc:
  Support for UDF on windows
sql/time.cc:
  Fixed bug when using wrong dates from blob field.
strings/ctype-tis620.c:
  Removed not used variable
support-files/mysql-max.spec.sh:
  Removed old not used section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Updated a link.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Build-tools/Do-rpm:
  will we ever get this -fno-omit-frame-pointer stuff right?
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

configure.in	Prevent inlining of functions on HP-UX because GCC is broken there
trx0trx.h	Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
trx0trx.c	Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
ha_innobase.cc	Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t


sql/ha_innobase.cc:
  Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
innobase/trx/trx0trx.c:
  Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
innobase/include/trx0trx.h:
  Fix trx->error_info in MySQL debug version: Innobase and ha_innobase.cc saw a different size for pthread_mutex_t
innobase/configure.in:
  Prevent inlining of functions on HP-UX because GCC is broken there
innobase/include/univ.i:
  Prevent inlining of functions on HP-UX because GCC is broken there
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

tests/mail_to_db.pl:
  Small fix.

tests/mail_to_db.pl:
  Added option for reading mails from stdin.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

fixed bug in variable assignment in mysqltest
fixed coredump on conversion from empty blob/text to date
added test case for empty blob conversion to date


BUILD/compile-pentium-debug:
  move bdb/innobase to compile-pentium-debug-max
client/mysqltest.c:
  fixed bug in variable assignment
sql/time.cc:
  fixed coredump on conversion from empty blob/text to date

BitKeeper/deleted/.del-btree_auto.c~a683156a176761f:
  Delete: bdb/btree/btree_auto.c
BitKeeper/deleted/.del-chk.define~aa9a626e58631003:
  Delete: bdb/dist/build/chk.define
BitKeeper/deleted/.del-chk.def~bb65b471d09f7c58:
  Delete: bdb/dist/build/chk.def
BitKeeper/deleted/.del-chk.offt~25759c9294db634e:
  Delete: bdb/dist/build/chk.offt
BitKeeper/deleted/.del-chk.srcfiles~ae884700cd110cbf:
  Delete: bdb/dist/build/chk.srcfiles
BitKeeper/deleted/.del-chk.tags~7a5b14d33d4078cc:
  Delete: bdb/dist/build/chk.tags
BitKeeper/deleted/.del-config.guess~ead1d91caeaa748c:
  Delete: bdb/dist/config.guess
BitKeeper/deleted/.del-config.hin~fdecb7a06fa137a7:
  Delete: bdb/dist/config.hin
BitKeeper/deleted/.del-config.sub~17e9990a298261a:
  Delete: bdb/dist/config.sub
BitKeeper/deleted/.del-crdel_auto.c~ee4146a08fd175c1:
  Delete: bdb/db/crdel_auto.c
BitKeeper/deleted/.del-db_auto.c~3186e950cc321ae7:
  Delete: bdb/db/db_auto.c
BitKeeper/deleted/.del-db_int.h~40ba51edce41403f:
  Delete: bdb/build_vxworks/db_int.h
BitKeeper/deleted/.del-db_int.h~9ee5645850a336a0:
  Delete: bdb/build_win32/db_int.h
BitKeeper/deleted/.del-include.tcl~f8bffb5e2510f229:
  Delete: bdb/build_win32/include.tcl
BitKeeper/deleted/.del-install-sh~1858c24340b72628:
  Delete: bdb/dist/install-sh
BitKeeper/deleted/.del-libdb.rc~906f4936ec6a8398:
  Delete: bdb/build_win32/libdb.rc
BitKeeper/deleted/.del-DbConstants.java~15fa87eda6b72302:
  Delete: bdb/java/src/com/sleepycat/db/DbConstants.java
BitKeeper/deleted/.del-btree_auto.h~84d4451c78faf67e:
  Delete: bdb/include/btree_auto.h
BitKeeper/deleted/.del-crdel_auto.h~1b8255da47550ece:
  Delete: bdb/include/crdel_auto.h
BitKeeper/deleted/.del-db_auto.h~994ddc84db334345:
  Delete: bdb/include/db_auto.h
BitKeeper/deleted/.del-db_server.h~61a33aa05bf368a7:
  Delete: bdb/include/db_server.h
BitKeeper/deleted/.del-db_server_clnt.c~b548b860f765c597:
  Delete: bdb/rpc_client/db_server_clnt.c
BitKeeper/deleted/.del-db_server_svc.c~35804eb82b953f49:
  Delete: bdb/rpc_server/db_server_svc.c
BitKeeper/deleted/.del-gen_client.c~ad86f092d0996a68:
  Delete: bdb/rpc_client/gen_client.c
BitKeeper/deleted/.del-hash_auto.c~d17c6a6ed4f181d1:
  Delete: bdb/hash/hash_auto.c
BitKeeper/deleted/.del-hash_auto.h~1b79cdd426d7ef25:
  Delete: bdb/include/hash_auto.h
BitKeeper/deleted/.del-log_auto.c~fe8c0369965f7151:
  Delete: bdb/log/log_auto.c
BitKeeper/deleted/.del-log_auto.h~8d52dd0884d03051:
  Delete: bdb/include/log_auto.h
BitKeeper/deleted/.del-qam_auto.c~361954d3f149feb0:
  Delete: bdb/qam/qam_auto.c
BitKeeper/deleted/.del-qam_auto.h~96f6c045fd0d6cab:
  Delete: bdb/include/qam_auto.h
BitKeeper/deleted/.del-rec_btree~65d6b0b2f5b7a6d2:
  Delete: bdb/dist/template/rec_btree
BitKeeper/deleted/.del-rec_crdel~58795c0c5232f80d:
  Delete: bdb/dist/template/rec_crdel
BitKeeper/deleted/.del-rec_db~52c5797539878fca:
  Delete: bdb/dist/template/rec_db
BitKeeper/deleted/.del-rec_hash~dcbdd106ae17b865:
  Delete: bdb/dist/template/rec_hash
BitKeeper/deleted/.del-rec_log~3fe6d62c43bc553a:
  Delete: bdb/dist/template/rec_log
BitKeeper/deleted/.del-rec_qam~6eecf6833de0af98:
  Delete: bdb/dist/template/rec_qam
BitKeeper/deleted/.del-rec_txn~1ff22b797deb0e1b:
  Delete: bdb/dist/template/rec_txn
BitKeeper/deleted/.del-txn_auto.h~e3f49e94fd291c45:
  Delete: bdb/include/txn_auto.h
BitKeeper/deleted/.del-db_server_xdr.c~336ef020b4a22c05:
  Delete: bdb/rpc_server/db_server_xdr.c
BitKeeper/deleted/.del-gen_db_server.c~d5602f9bd5c930e:
  Delete: bdb/rpc_server/gen_db_server.c
BitKeeper/deleted/.del-include.tcl~20fc297b040cbe2:
  Delete: bdb/test/include.tcl
BitKeeper/deleted/.del-txn_auto.c~6eb282f016f606d9:
  Delete: bdb/txn/txn_auto.c

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

Docs/manual.texi:
  Clear up how ROUND() works.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/include/ut0dbg.h:
  Print a better error message when an assertion fails

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

Docs/manual.texi:
  updates for Linux notes

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


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

BUILD/compile-pentium:
  do not build innobase and bdb, build it in max instead

os0thread.c	Fix os_thread_sleep: did not work if over 1000000 microsecs; caused slowness at least on Solaris and FreeBSD


innobase/os/os0thread.c:
  Fix os_thread_sleep: did not work if over 1000000 microsecs; caused slowness at least on Solaris and FreeBSD

os0thread.c	Use pthread_yield instead of os_thread_sleep(0)


innobase/os/os0thread.c:
  Use pthread_yield instead of os_thread_sleep(0)
innobase/sync/sync0sync.c:
  Fix the infinite spin on FreeBSD
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Edits to first 10,000 lines from read-through.

into abel.spaceapes.com:/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Update pubdate for PHP/MySQL book.

sometimes the server lags behind the client on startup - to fix, if the initial connect fails, sleep and try again
before giving up


client/mysqltest.c:
  try to connect again before giving up if first connect fails

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


configure.in:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

configure.in:
  updates for --with-other-libc
heap/Makefile.am:
  --with-other-libc
libmysql/Makefile.shared:
  --with-other-libc
mysys/Makefile.am:
  --with-other-libc
regex/Makefile.am:
  --with-other-libc
sql/Makefile.am:
  --with-other-libc
strings/Makefile.am:
  --with-other-libc

sql-bench/test-insert.sh:
  Allow the db to use multi value inserts if run with --fast.

Docs/manual.texi:
  Fixed nodes and menus with xemacs
  Moved some C API sections to subsections
mysql-test/r/alter_table.result:
  Test result for new test case

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

Fixed bug where FLUSH TABLES could make indexes unavailable for the next query
Added --skip-safemalloc


Docs/manual.texi:
  Added some information about --with-debug=full
sql/lex.h:
  Added INNODB as a synonym for INNOBASE
sql/mysqld.cc:
  Added myisam variables.
  Moved shutdown message to after databases has been closed.
  Removed old define for MacOS X.
  Added --skip-safemalloc.
  Added missing \ to strings
sql/sql_base.cc:
  Fixed bug where FLUSH TABLES could make indexes unavailable for
  the next query.
support-files/my-huge.cnf.sh:
  Added / to end of innobase directory options
support-files/my-large.cnf.sh:
  Added / to end of innobase directory options
support-files/my-medium.cnf.sh:
  Added / to end of innobase directory options
support-files/my-small.cnf.sh:
  Added / to end of innobase directory options
tests/fork_big.pl:
  Made test harder

Docs/manual.texi:
  Fixed typos.

Removed _mi_rkey() function
New fork_big.pl multi-thread test


BitKeeper/deleted/.del-fork3_test.pl~c4a7bffb4f8e813c:
  Delete: tests/fork3_test.pl
BitKeeper/deleted/.del-fork_test.pl~3d3535329ed8cd5e:
  Delete: tests/fork_test.pl
Docs/manual.texi:
  Changelog.
  Updated support information
client/mysqladmin.c:
  Removed not used --timeout option
configure.in:
  Update version
myisam/mi_extra.c:
  Fixed bug in ALTER TABLE
myisam/mi_rkey.c:
  Removed _mi_rkey() function
myisam/myisamdef.h:
  Removed _mi_rkey() function
myisammrg/myrg_rkey.c:
  Removed _mi_rkey() function
myisammrg/myrg_rnext.c:
  Removed _mi_rkey() function
mysql-test/t/alter_table.test:
  Added test case for ALTER TABLE bug
sql/derror.cc:
  Moved shutdown message to clean_up
sql/mysql_priv.h:
  Moved shutdown message to clean_up
sql/sql_class.cc:
  Fixed bug in MySQL compiled with transactions but using --skip-"table-handler"
sql/sql_show.cc:
  Use time_after_lock for time of query when debugging
sql/sql_test.cc:
  Check memory overruns when using 'mysqladmin debug'
strings/ctype-tis620.c:
  F