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

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

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

Docs/manual.texi:
  Lots of corrections and cleanups.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Mirror maintenance.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Reorganized and renamed the API chapter.


Docs/manual.texi:
  - Lots of maintenance.
  - Moved the C API info to subsections and subsubsections of the main
    MySQL C API section.
  - Added chapter, section, appendix intros where they were missing.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/t/isolation.test:
  Added check if Gemini is used
  Removed 'use test'

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

Call init_signals before intializing table handlers. This should fix the signal problem in Innobase on Solaris


Docs/manual.texi:
  Updated changelog
include/myisam.h:
  Let ALTER TABLE and LOAD DATA INFILE use sorting to create index
myisam/mi_check.c:
  Let ALTER TABLE and LOAD DATA INFILE use sorting to create index
myisam/myisamchk.c:
  Let ALTER TABLE and LOAD DATA INFILE use sorting to create index
sql/ha_myisam.cc:
  Let ALTER TABLE and LOAD DATA INFILE use sorting to create index
sql/mysqld.cc:
  Call init_signals before intializing table handlers. This should fix the signal problem in Innobase on Solaris

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


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

once after the lock. Now changed test case and added eval support to
mysqltest to make it easier to debug


client/mysqltest.c:
  added eval query command to be able to use variables in a query
mysql-test/r/rpl000016.result:
  updates for new test case
mysql-test/t/rpl000016.test:
  changed test case to make it easier to debug

ut0dbg.h	Innobase now prints the line and file of an assertion failure


innobase/include/ut0dbg.h:
  Innobase now prints the line and file of an assertion failure
innobase/log/log0log.c:
  Failure to create or open the archive log file now results in exit(1)

innobase/os/os0thread.c:
  Added &attr to os_thread_create to get in compile on HP-UX

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


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

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

data0type.c	Small changes to eliminate some asserts in the debug version
data0type.ic	Small changes to eliminate some asserts in the debug version


innobase/data/data0data.c:
  Small changes to eliminate some asserts in the debug version
innobase/data/data0type.c:
  Small changes to eliminate some asserts in the debug version
innobase/include/data0type.ic:
  Small changes to eliminate some asserts in the debug version

New lock test


Docs/manual.texi:
  Small update
sql/sql_base.cc:
  Fixed bug in lock tables introduced by shared locks.

increase coverage for table.cc in mysql_rm_table()
ingore temporary gcov files
fixed bug in replication test case


BitKeeper/etc/ignore:
  added *.da
BUILD/compile-pentium-gcov:
  do not build shared libraries - combination of -fPIC and the coverage flags
  triggers a bug in gcc, apparently - problem went away after adding
  --disable-shared
mysql-test/t/flush.test:
  extra test to increase coverage of table.cc
mysql-test/t/rpl000016.test:
  fixed bug in test case - insert may be concurrent, so we may read the
  table on the slave before the last insert becomes visible even when the 
  master position is up to date if we do not
  lock it explicitly

Removed all Attic directories.


BitKeeper/deleted/.del-myisam.doc~519bb06ecc870298:
  Delete: Docs/Attic/myisam.doc
BitKeeper/deleted/.del-libmysql.c~72949a7043113807:
  Delete: client/Attic/libmysql.c
BitKeeper/deleted/.del-net.c~c18042da6fa4e693:
  Delete: client/Attic/net.c
BitKeeper/deleted/.del-print_defaults.c~362952979aa7b330:
  Delete: extra/Attic/print_defaults.c
BitKeeper/deleted/.del-config-win32.h~65db818ec7e8f21b:
  Delete: include/Attic/config-win32.h
BitKeeper/deleted/.del-m_ctype.h.in~f671e3c2d611ba97:
  Delete: include/Attic/m_ctype.h.in
BitKeeper/deleted/.del-mysql_com.h.in~85b1ea7ced528c32:
  Delete: include/Attic/mysql_com.h.in
BitKeeper/deleted/.del-ft_global.h~fe46fb515f1e375:
  Delete: myisam/Attic/ft_global.h
BitKeeper/deleted/.del-lex_hash.h~14f912771118b50c:
  Delete: sql/Attic/lex_hash.h
BitKeeper/deleted/.del-mini_client.c~9a3778c387d06a81:
  Delete: sql/Attic/mini_client.c
BitKeeper/deleted/.del-mini_client_errors.c~29edad51a5d0b068:
  Delete: sql/Attic/mini_client_errors.c
BitKeeper/deleted/.del-mybinlogdump.cc~5dbdd2bde98d6169:
  Delete: sql/Attic/mybinlogdump.cc
BitKeeper/deleted/.del-net_serv.c~52dabcd773a39e10:
  Delete: sql/Attic/net_serv.c
BitKeeper/deleted/.del-bootstrap-ctype.c~6d2a8cda2d6a35ff:
  Delete: strings/Attic/bootstrap-ctype.c
BitKeeper/deleted/.del-ct_init.c~f0948bdd35ceedc3:
  Delete: strings/Attic/ct_init.c
BitKeeper/deleted/.del-ctype-cp1251.c~cdf74b9168408b3:
  Delete: strings/Attic/ctype-cp1251.c
BitKeeper/deleted/.del-ctype-cp1257.c~732611cbc74aeafc:
  Delete: strings/Attic/ctype-cp1257.c
BitKeeper/deleted/.del-ctype-croat.c~d2d805ee6f10cbcc:
  Delete: strings/Attic/ctype-croat.c
BitKeeper/deleted/.del-ctype-danish.c~dc5451066eb272ae:
  Delete: strings/Attic/ctype-danish.c
BitKeeper/deleted/.del-ctype-dec8.c~68f257dd2202d0c7:
  Delete: strings/Attic/ctype-dec8.c
BitKeeper/deleted/.del-ctype-dos.c~f77bd08acf13a8c1:
  Delete: strings/Attic/ctype-dos.c
BitKeeper/deleted/.del-ctype-estonia.c~fc8a69424f7cb66b:
  Delete: strings/Attic/ctype-estonia.c
BitKeeper/deleted/.del-ctype-german1.c~f7830c509bb358f7:
  Delete: strings/Attic/ctype-german1.c
BitKeeper/deleted/.del-ctype-greek.c~90acdff1195209ca:
  Delete: strings/Attic/ctype-greek.c
BitKeeper/deleted/.del-ctype-hebrew.c~d3b4a000d51e76dc:
  Delete: strings/Attic/ctype-hebrew.c
BitKeeper/deleted/.del-ctype-hp8.c~749e1be0f028d349:
  Delete: strings/Attic/ctype-hp8.c
BitKeeper/deleted/.del-ctype-hungarian.c~5cf0bf7fa0312637:
  Delete: strings/Attic/ctype-hungarian.c
BitKeeper/deleted/.del-ctype-koi8_ru.c~8ff4188c642c9bd:
  Delete: strings/Attic/ctype-koi8_ru.c
BitKeeper/deleted/.del-ctype-koi8_ukr.c~a04aa14a6d62335a:
  Delete: strings/Attic/ctype-koi8_ukr.c
BitKeeper/deleted/.del-ctype-latin1.c~cc63880f19c2303e:
  Delete: strings/Attic/ctype-latin1.c
BitKeeper/deleted/.del-ctype-latin2.c~31895c4b83654342:
  Delete: strings/Attic/ctype-latin2.c
BitKeeper/deleted/.del-ctype-swe7.c~bb1b012225d7d02c:
  Delete: strings/Attic/ctype-swe7.c
BitKeeper/deleted/.del-ctype-usa7.c~d19d859dca5675f:
  Delete: strings/Attic/ctype-usa7.c
BitKeeper/deleted/.del-ctype-win1250.c~1ce7a24255780a1:
  Delete: strings/Attic/ctype-win1250.c
BitKeeper/deleted/.del-ctype-win1251.c~762607f4fd7d52ad:
  Delete: strings/Attic/ctype-win1251.c
BitKeeper/deleted/.del-ctype-win1251ukr.c~b5a7cca889bbef58:
  Delete: strings/Attic/ctype-win1251ukr.c
BitKeeper/deleted/.del-ctype.c.in~8bf48d4bcbc5f675:
  Delete: strings/Attic/ctype.c.in
BitKeeper/deleted/.del-memory.h~450f586e82a26d99:
  Delete: strings/Attic/memory.h
BitKeeper/deleted/.del-ptr_cmp.c~57e682a26e769597:
  Delete: strings/Attic/ptr_cmp.c
BitKeeper/deleted/.del-my-example.cnf.sh~87a7e1f4d24b62a9:
  Delete: support-files/Attic/my-example.cnf.sh
BitKeeper/deleted/.del-my-huge.cfg.sh~589bdcd2d2c4360b:
  Delete: support-files/Attic/my-huge.cfg.sh
BitKeeper/deleted/.del-my-large.cfg.sh~842c8e76253c9396:
  Delete: support-files/Attic/my-large.cfg.sh
BitKeeper/deleted/.del-my-medium.cfg.sh~c49880d26ef0648e:
  Delete: support-files/Attic/my-medium.cfg.sh
BitKeeper/deleted/.del-my-small.cfg.sh~85023c559a1d96c:
  Delete: support-files/Attic/my-small.cfg.sh
sql/ha_innobase.cc:
  Fix a crash with tables with many columns and a range query: memory corruption occurred
Docs/manual.texi:
  Changelog
mysql-test/r/innobase.result:
  New test case for innobase
scripts/mysql_install_db.sh:
  Fixed typo
sql/ha_berkeley.h:
  Fixed that 'have_bdb' is disabled if we can't initialize bdb
sql/ha_gemini.cc:
  Removed include file that got compiliation to fail on some systems
sql/handler.cc:
  Fixed that 'have_tabltype' is disabled if we can't initialize it.
sql/mysqld.cc:
  Fix bug that could cause a fast connect/close to fail when using --debug

BUILD/compile-solaris-sparc-purify:
  Changed to old (easy-to-edit) format
extra/resolve_stack_dump.c:
  Don't require -s and -n options
innobase/include/Makefile.i:
  Applied Heikki's changes
innobase/include/univ.i:
  Applied Heikki's changes
innobase/os/os0file.c:
  Fix problem with Signal 14 on Solaris
mysys/mf_qsort.c:
  Fix for purify
sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha:
  New test results
sql/ha_gemini.h:
  Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized.
sql/ha_innobase.cc:
  Merged Heikkis changes
sql/ha_innobase.h:
  Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized.
sql/handler.cc:
  Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized.
sql/mysqld.cc:
  Cleaned up error warning message.

Docs/manual.texi:
  Added information about \Z
innobase/os/os0file.c:
  Fixed problem with signals on Solaris
sql/ha_innobase.cc:
  Removed not needed sign()

(For glibc 2.2)


client/thread_test.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
dbug/dbug.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
heap/hp_open.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
isam/open.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
myisam/mi_open.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_alarm.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_lock.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
mysys/thr_rwlock.c:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/ha_berkeley.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/ha_innobase.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/hash_filo.h:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/hostname.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/item_func.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/log.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/mysqld.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/slave.h:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_class.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_class.h:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_insert.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
sql/sql_udf.cc:
  Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro

Docs/manual.texi:
  Changelog
sql/gen_lex_hash.cc:
  Better hash values

    fixed concurrency bug with a very quickly disconnecting client -
    the client could disconnect and delete thd before pthread_create 
    could write to &thd->real_id 
sql/sql_list.h
    while tracking down the bug, made new/delete go through my_malloc/my_free
    for ilink - did not help, but this is better anyway - cleaner exit with a message in
    out of memory codition at least.


sql/mysqld.cc:
  fixed concurrency bug with a very quickly disconnecting client -
  the client could disconnect and delete thd before pthread_create 
  could write to &thd->real_id
sql/sql_list.h:
  while tracking down the bug, made new/delete go through my_malloc/my_free
  for ilink - did not help, but this is better anyway - cleaner exit with a message in
  out of memory codition at least.

Removed usage of @r/result as this made life hard when testing different
table handlers.
Allow concurrent inserts if no update/binary log.
Don't remove key_cache at flush tables.
Fixed bug in SELECT DISTINCT SUM()...


BitKeeper/deleted/.del-rpl000012.status.result~bbbd650b5beea32f:
  Delete: mysql-test/r/rpl000012.status.result
BitKeeper/deleted/.del-rpl000013.status.result~6bee190c298cc9fd:
  Delete: mysql-test/r/rpl000013.status.result
Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Fixed bug in 'send' that Sasha had introduced.
  Make database, port and socket optional parameters to connect()
mysql-test/r/rpl000005.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/rpl000006.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/rpl000012.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/rpl000013.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/r/sel000033.result:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/backup.test:
  Use default port and socket.
mysql-test/t/dirty-close.test:
  Use default port and socket.
mysql-test/t/flush.test:
  Use default port and socket.
mysql-test/t/kill.test:
  Use default port and socket.
mysql-test/t/overflow.test:
  Use default port and socket.
mysql-test/t/rpl000003.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000005.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000006.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000007.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000008.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000009.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000010.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000011.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000012.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/rpl000013.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000001.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000002.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000003.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000031.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000032.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000033.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/sel000100.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/shw000001.test:
  Removed usage of @r/result as this made life hard when doing
  test for multiple table handlers.
mysql-test/t/status.test:
  Use default port and socket.
sql/gen_lex_hash.cc:
  Smaller hash table
sql/mysql_priv.h:
  Allow concurrent inserts if no update/binary log
sql/mysqld.cc:
  Allow concurrent inserts if no update/binary log
  Don't remove key_cache at flush tables
sql/sql_base.cc:
  Don't remove key_cache at flush tables
sql/sql_select.cc:
  Fix bug in SELECT DISTINCT SUM().
sql/sql_yacc.yy:
  Allow concurrent inserts if no update/binary log
tests/export.pl:
  C

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

Fixed crash in SELECT DISTINCT SUM(...)
Fix return value of mysortncmp() for innobase
Fix join_crash bug


Docs/manual.texi:
  Changelog
include/my_pthread.h:
  Added defines for fast mutex in glibc 2.2
mysql-test/t/join_crash.test:
  Changed table names to t1,t2...
mysys/my_bitmap.c:
  Use fast mutex
mysys/my_open.c:
  Use fast mutex
mysys/my_pthread.c:
  Use fast mutex
mysys/my_thr_init.c:
  Use fast mutex
mysys/my_winthread.c:
  Use fast mutex
mysys/thr_mutex.c:
  Use new mutexattr with error checking
sql/ha_innobase.cc:
  Fix return value of mysortncmp() for innobase
sql/sql_select.cc:
  Fix join_crash bug
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted