mysql-test/t/handler.test:
  new tests
sql/sql_handler.cc:
  bugfix

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

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

sql/sql_table.cc:
  fixed typo in comment

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

tables - read comments below


client/mysqltest.c:
  fixed bug in send/reap 
  added comments explaining how things work 
  to remove from Monty the temptation to "clean up" my code
  use a separate pointer for the test line buffer from the query itself - in the
  case of send they are not the same
  added memory clean-up for register variables
mysql-test/mysql-test-run.sh:
  added --skip-* option - you can now skip anything you want, good thing
  to skip is bdb and innobase if you are running only one test to speed
  up server startup
mysql-test/t/flush.test:
  fixed up flush test after fixing send/reap bug - now found a new bug
  with flush - I get 1034 incorrect key file error on this - will 
  investigate why, but thought I'd commit the test case first
  
  Another case to support Sinisa's assertion that FLUSH TABLES is dangerous
  and should be avoided :-)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Fix up.

Docs/manual.texi:
  One more mirror.

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

Docs/manual.texi:
  Fixed typos

BitKeeper/etc/logging_ok:
  auto-union

Fixed bug in CONCAT_WS()
Print the default ISOLATION level.
Change lock type for CREATE ... SELECT and INSERT/REPLACE ... SELECT


Docs/manual.texi:
  Changelog
mysql-test/r/func_str.result:
  Added tests for CONCAT_WS()
mysql-test/r/update.result:
  Test case for bug when updating on key
mysql-test/t/func_str.test:
  Added tests for CONCAT_WS()
mysql-test/t/update.test:
  Test case for bug when updating on key
sql/gen_lex_hash.cc:
  Better hash values
sql/handler.cc:
  Added missig NullS
sql/item_strfunc.cc:
  Fixed bug in CONCAT_WS()
sql/mysql_priv.h:
  Print the default ISOLATION level.
sql/mysqld.cc:
  Print the default ISOLATION level.
sql/sql_insert.cc:
  Remove unnecessary call to setup_tables()
sql/sql_parse.cc:
  Change lock type for CREATE ... SELECT and INSERT/REPLACE ... SELECT
sql/sql_yacc.yy:
  Change lock type for CREATE ... SELECT and INSERT/REPLACE ... SELECT
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

added flush test case, but had to comment the fun part out because it
does not work for some reason - will investigate why. 


sql/sql_base.cc:
  fixed bugs on re-open of temp tables after FLUSH in the middle of open

acinclude.m4:
  do not build Gemini by default
configure.in:
  do MYSQL_CHECK_GEMINI - otherwise it does not compile
BitKeeper/etc/ignore:
  Added BitKeeper/etc/level to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

acinclude.m4:
  Removed redundant Gemini check section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fix bug when read return error


acconfig.h:
  Add Gemini to configure
acinclude.m4:
  Add Gemini to configure
include/my_base.h:
  Add error codes for tables handlers
mysql-test/t/select.test:
  Force temporary tables to MyISAM
sql-bench/server-cfg.sh:
  Allow Gemini to run sql-bench
sql/Makefile.am:
  Add Gemini to configure
sql/handler.cc:
  Add support for Gemini table handler
sql/handler.h:
  Add support for Gemini table handler
sql/lex.h:
  Add support for Gemini table handler
sql/mysqld.cc:
  Add support for Gemini table handler
sql/opt_range.cc:
  Fix bug when read return error
sql/records.cc:
  Fix bug when read return error
sql/sql_class.cc:
  Add support for Gemini table handler
sql/sql_class.h:
  Add support for Gemini table handler
sql/sql_lex.h:
  Add support for Gemini table handler
sql/sql_rename.cc:
  Add commit for table rename
sql/sql_table.cc:
  Add commit for table rename
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixed problem with UPDATE TABLE when keys wheren't always used.


Docs/manual.texi:
  Added comment to ALTER TABLE
scripts/mysql_install_db.sh:
  Added test for mysqld in libexec
sql/ha_innobase.cc:
  Removed compiler warning
sql/mysql_priv.h:
  Split setup_fields to setup_tables and setup_fields
sql/sql_base.cc:
  Split setup_fields to setup_tables and setup_fields
sql/sql_insert.cc:
  Split setup_fields to setup_tables and setup_fields
sql/sql_load.cc:
  Split setup_fields to setup_tables and setup_fields
sql/sql_parse.cc:
  Fixed missing 'mysql_info" with now clients.
sql/sql_select.cc:
  Split setup_fields to setup_tables and setup_fields
sql/sql_update.cc:
  Fixed problem with UPDATE TABLE when keys wheren't always used.
sql/sql_yacc.yy:
  Small isolation change

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

Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE


Docs/manual.texi:
  Updated information about SET TRANSACTION ISOLATION LEVEL
configure.in:
  Upgraded version number
isam/_dbug.c:
  Fixed wrong fprintf
isam/isamchk.c:
  Added new error message
myisam/mi_check.c:
  Added new error message
mysql-test/mysql-test-run.sh:
  Don't wait too long for server start
mysys/mf_keycache.c:
  Cleaned up some error messages
scripts/mysqlhotcopy.sh:
  Applied patch for --resetmaster --resetslave
sql-bench/bench-init.pl.sh:
  Fix for windows
sql/handler.cc:
  Added isolation levels and gemini spinlocks
sql/handler.h:
  Added isolation levels
sql/item_strfunc.cc:
  Cleanup of CONCAT_WS()
sql/lex.h:
  Added isolation levels
sql/mysql_priv.h:
  Added isolation levels
sql/mysqld.cc:
  Added isolation levels
sql/sql_class.cc:
  Added isolation levels
  Moved variable initialization to different code segments
sql/sql_class.h:
  Added isolation levels
sql/sql_lex.h:
  Added isolation levels
sql/sql_parse.cc:
  Added isolation levels
sql/sql_update.cc:
  cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Auto merged

manual.texi	of empty fields; minor changes to recent change
manual.texi	notes.


Docs/manual.texi:
  added clarification on LOAD DATA section on handling
  of empty fields; minor changes to recent change
  notes.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

buf0lru.c	Fixed a race condition in buf0lru and btr0sea which could corrupt the LRU list


innobase/buf/buf0buf.c:
  Fixed a race condition in buf0lru and btr0sea which could corrupt the LRU list
innobase/buf/buf0lru.c:
  Fixed a race condition in buf0lru and btr0sea which could corrupt the LRU list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Updated changelog

Docs/manual.texi:
  Updated info about some common problems.
mysql-test/r/user_var.result:
  Added tests of using user variables.
mysql-test/t/user_var.test:
  Added tests of using user variables.

    clean-up/update of Linux-Notes


Docs/manual.texi:
  clean-up/update of Linux-Notes

into central.snake.net:/home/paul/mysql


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