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

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

Docs/manual.texi:
  mods to recent change notes

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

Docs/manual.texi:
  Updated links
client/mysqltest.c:
  Added 'ping' method
configure.in:
  Upgraded version number
mysql-test/r/user_var.result:
  Added test for using variables with distinct
mysql-test/t/kill.test:
  Use 'ping' to force reconnect
mysql-test/t/user_var.test:
  Added test for using variables with distinct
sql-bench/run-all-tests.sh:
  Fixed argument passing

BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  Auto merged

Fixed bug in SHOW VARIABLES when using innobase tables


Docs/manual.texi:
  Updated support prices and support information
include/mysql_com.h:
  Fixed CLIENT_TRANSACTIONS define
sql/mysqld.cc:
  Fixed bug in SHOW VARIABLES when using innobase tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/os/os0thread.c:
  Use pthread_attr_init instead of ..._create

innobase/srv/srv0srv.c:
  Eliminate another warning on HP-UX

srv0srv.c	Eliminate wrong type calls of os_thread_create


innobase/srv/srv0srv.c:
  Eliminate wrong type calls of os_thread_create
innobase/srv/srv0start.c:
  Eliminate wrong type calls of os_thread_create

innobase/include/page0types.h:
  Eliminate a name collision on page_t on HP-UX

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

innobase/fsp/fsp0fsp.c:
  Circumvent a bug in Visual C inlining

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

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


sql/sql_class.cc:
  Auto merged

sql/sql_lex.cc:
  Changed serg's fix back.

added support for kill expr
fixed coredump in set @A := foo;
added testcase for user_var
added testcase for kill


sql/slave.cc:
  fd -> vio
sql/sql_class.cc:
  fd->vio, fixed coredump on set @A := foo;
sql/sql_class.h:
  fd -> vio
sql/sql_repl.cc:
  fd -> vio
sql/sql_yacc.yy:
  added support for kill expr - needed this for a clean test case of kill

sql/field.cc    ORDER BY bug fixed


mysql-test/r/order_by.result:
  fixed for new test
sql/field.cc:
  ORDER BY bug fixed

mysql-test-run.sh	PATH corrected


mysql-test/mysql-test-run.sh:
  PATH corrected
sql/sql_lex.cc:
  per-thread state_map temporarily disabled

sql/sql_insert.cc:
  merged

manual.texi	Updated Mascon entry to new version.


Docs/manual.texi:
  Typo fix. Added mirror in Ukraine.

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


Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

interrupt I/O after thr_alarm_kill()

test case for order by desc coredump


mysql-test/t/order_by.test:
  added test case for order by desc bug
sql/slave.cc:
  close socket on slave stop
sql/slave.h:
  close socket on slave stop
sql/sql_class.cc:
  close socket on slave stop
sql/sql_class.h:
  close socket on slave stop
sql/sql_parse.cc:
  changed kill_one_thread to use prepare_to_die()
sql/sql_repl.cc:
  close socket on slave stop

Docs/manual.texi:
  Added News section for 3.23.35, and change notes for SQL_ANSI_MODE.
sql/gen_lex_hash.cc:
  Fixed typo.
  Updated the values, so the parser can be created.
sql/mysql_priv.h:
  Added ``global_state_map'' from sql_lex.cc.
sql/sql_class.h:
  Added ``state_map'' to THD.  This is a per-thread state map for lex.
sql/sql_lex.cc:
  Renamed ``state_map'' to ``global_state_map''.
  Changed yylex() to use the new per-thread state map.
sql/sql_parse.cc:
  Copy global_state_map into thd->state_map on thread start.
sql/sql_yacc.yy:
  Added SQL_ANSI_MODE.
  Cleaned up some.