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.

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


Docs/manual.texi:
  Auto merged

myisammrg/myrg_rprev.c    bug with incomlete queue fixed


myisammrg/myrg_rnext.c:
  bug with incomlete queue fixed
myisammrg/myrg_rprev.c:
  bug with incomlete queue fixed

Docs/manual.texi:
  Added notes about 3.23.34a
innobase/mem/Makefile.am:
  Add missing files
innobase/pars/Makefile.am:
  fixed typo
sql-bench/run-all-tests.sh:
  Fix for windows

Added missing files for innobase to the distribution


BUILD/compile-pentium-debug:
  Always compile with BDB tables
BUILD/compile-pentium:
  Always compile with BDB tables
configure.in:
  Added missing files for innobase to the distribution
innobase/mem/Makefile.am:
  Added missing files for innobase to the distribution
innobase/pars/Makefile.am:
  Added missing files for innobase to the distribution
sql/ha_isam.h:
  Don't use record cache with delete
sql/handler.h:
  Optimization of delete with record cache
sql/mysql_priv.h:
  Optimization of delete with record cache
sql/records.cc:
  Optimization of delete with record cache
sql/sql_delete.cc:
  Optimization of delete with record cache

Docs/manual.texi:
  Updated some typos in the innobase section
client/mysql.cc:
  Added print of field types (for debugging)
client/mysqladmin.c:
  Added timeout for shutdown
mysql-test/mysql-test-run.sh:
  Use timeout for shutdown
sql-bench/test-select.sh:
  Added test of query cache and new tests for count(distinct)
sql/ha_myisam.cc:
  Don't give warnings for RESTORE TABLE
sql/mysqld.cc:
  Added printing of innobase options
sql/sql_lex.cc:
  Fixed possible bug when OEM
sql/sql_table.cc:
  cleanup

Docs/manual.texi:
  Updated changelog
mysql-test/README:
  Added reference to manual
mysql-test/r/bdb.result:
  Added test for MAX() bug
mysql-test/r/innobase.result:
  Added test for MAX() bug
mysql-test/t/bdb.test:
  Added test for MAX() bug
mysql-test/t/innobase.test:
  Added test for MAX() bug
sql-bench/server-cfg.sh:
  Don't create big blobs with innobase
sql/ha_berkeley.cc:
  Fixed bug in MAX() optimizing
BitKeeper/etc/ignore:
  Added sql/.gdbinit to the ignore list
sql/ha_innobase.h:
  Fixed bug in MAX() optimizing
sql/handler.h:
  Fixed bug in MAX() optimizing
sql/opt_sum.cc:
  Fixed bug in MAX() optimizing

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


Docs/manual.texi:
  Auto merged

Added delayed_user for delayed_threads
Don't use record cache when doing deletes


Docs/manual.texi:
  Added link to activestate perl
mysql-test/t/delayed.test:
  Added sleep for slow machines
scripts/mysql_install_db.sh:
  Fixed wrong option
sql-bench/crash-me.sh:
  Intialize some variables
sql/mysql_priv.h:
  Added delayed_user for delayed_threads
sql/mysqld.cc:
  Added delayed_user for delayed_threads
sql/sql_class.cc:
  Added delayed_user for delayed_threads
sql/sql_delete.cc:
  Don't use record cache when doing deletes
sql/sql_insert.cc:
  Added delayed_user for delayed_threads
tests/fork3_test.pl:
  Added periodic check/repair of table

mysql-test/mysql-test-run.sh:
  Added more informative error message