sql/ha_myisam.cc:
  merged
sql/share/russian/errmsg.txt:
  merged

opt_range.h	bugs with const_tables and filesort fixed
opt_range.cc	bugs with const_tables and filesort fixed
item_func.cc	bugs with const_tables and filesort fixed
ha_myisam.h	bugs with const_tables and filesort fixed
ha_myisam.cc	bugs with const_tables and filesort fixed
ft_search.c	bugs with const_tables and filesort fixed


myisam/ft_search.c:
  bugs with const_tables and filesort fixed
sql/ha_myisam.cc:
  bugs with const_tables and filesort fixed
sql/ha_myisam.h:
  bugs with const_tables and filesort fixed
sql/item_func.cc:
  bugs with const_tables and filesort fixed
sql/opt_range.cc:
  bugs with const_tables and filesort fixed
sql/opt_range.h:
  bugs with const_tables and filesort fixed
sql/share/russian/errmsg.txt:
  translated

Docs/manual.texi:
  Fixed another bad URL.

Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  Fixed bad crash-me uref.

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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

added error code to master failed connect message


BitKeeper/etc/ignore:
  Added libmysql_r/acconfig.h libmysql_r/array.c libmysql_r/bchange.c libmysql_r/bmove.c libmysql_r/bmove_upp.c libmysql_r/charset.c libmysql_r/conf_to_src.c libmysql_r/ctype_autoconf.c libmysql_r/ctype-big5.c libmysql_r/ctype.c libmysql_r/ctype-czech.c libmysql_r/ctype-euc_kr.c libmysql_r/ctype-gb2312.c libmysql_r/ctype-gbk.c libmysql_r/ctype-sjis.c libmysql_r/ctype-tis620.c libmysql_r/ctype-ujis.c libmysql_r/dbug.c libmysql_r/default.c libmysql_r/dll.c libmysql_r/errmsg.c libmysql_r/errors.c libmysql_r/getopt1.c libmysql_r/getopt.c libmysql_r/get_password.c libmysql_r/getvar.c libmysql_r/int2str.c libmysql_r/is_prefix.c libmysql_r/libmysql.c libmysql_r/list.c libmysql_r/llstr.c libmysql_r/longlong2str.c libmysql_r/mf_casecnv.c libmysql_r/mf_dirname.c libmysql_r/mf_fn_ext.c libmysql_r/mf_format.c libmysql_r/mf_loadpath.c libmysql_r/mf_pack.c libmysql_r/mf_path.c libmysql_r/mf_tempfile.c libmysql_r/mf_unixpath.c libmysql_r/mf_wcomp.c libmysql_r/mulalloc.c libmysql_r/my_alloc.c libmysql_r/my_compress.c libm
sql/share/romanian/errmsg.sys:
  touched again
sql/slave.cc:
  print error code on failed connects
sql/sql_base.cc:
  use int4store() instead of direct ponter casts
libmysql_r/acconfig.h:
  ***MISSING WEAVE***

Docs/manual.texi:
  Auto merged

Run bootstrap in separate thread
Fix bug in FLUSH TABLES table_name


Docs/manual.texi:
  Updated ChangeLog
client/mysql.cc:
  Added info about compressed protocol
include/getopt.h:
  Fix for OS2
include/global.h:
  Fix for OS2
include/my_sys.h:
  Fix for OS2
include/mysql_com.h:
  Fix for OS2
include/thr_alarm.h:
  Cleanup up alarm struct for OS2 port
isam/isamchk.c:
  Fix for OS2
libmysql/libmysql.c:
  cleanup
libmysql/net.c:
  Use new thr_alarm
libmysql/violite.c:
  Fix for OS2
myisam/ChangeLog:
  Changes
myisam/mi_create.c:
  Use less stack
myisam/myisamchk.c:
  Fix for OS2
mysys/default.c:
  Fix for OS2
mysys/getopt.c:
  Fix for OS2
mysys/mf_format.c:
  Safety
mysys/mf_path.c:
  Fix for OS2
mysys/my_create.c:
  Fix for OS2
mysys/my_lock.c:
  Fix for OS2
mysys/my_open.c:
  Fix for OS2
mysys/thr_alarm.c:
  Use new thr_alarm struct
readline/input.c:
  Fix for OS2
readline/rltty.c:
  Fix for OS2
sql/ha_myisam.cc:
  Remove unnecessary fn_format
sql/my_lock.c:
  Use new thr_alarm
sql/mysql_priv.h:
  Changed bootstrap to run in separate thread to avoid problem with
  small stack
sql/mysqld.cc:
  Changed bootstrap to run in separate thread to avoid problem with
  small stack
sql/net_serv.cc:
  Use new thr_alarm
sql/sql_base.cc:
  Fix problem with FLUSH TABLE table_name
sql/sql_class.cc:
  Fix for new bootstrap
sql/sql_class.h:
  cleanup
sql/sql_delete.cc:
  cleanup
sql/sql_load.cc:
  Fix for OS2
sql/sql_parse.cc:
  Changed bootstrap to run in separate thread to avoid problem with
  small stack
sql/sql_select.cc:
  Reset used structure elements
sql/sql_table.cc:
  For OS2
sql/violite.c:
  For OS2

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/local


Docs/manual.texi:
  Auto merged

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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

Docs/manual.texi:
  Added two mirrors in Asia.

into evoq.home.mwagner.org:/home/mwagner/work/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  developer@lists -> internals@lists email address.

sql/slave.cc:
  Auto merged
Docs/manual.texi:
  Merge

BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.12_20smp_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.1_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_dynamic:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_pgcc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_static:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_local_tcp-Linux_2.0.33_i586:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_new-Linux_2.0.33_i586:
  ***MISSING WEAVE***
Docs/Makefile.am:
  Removed manual.pdf from the standard distribution
Docs/manual.texi:
  Updated table maintaince and timeouts
Makefile.am:
  Added missing targets
client/mysql.cc:
  Added -O connect_timeout
client/mysqladmin.c:
  Added -O connect_timeout
configure.in:
  3.23.29
libmysql/libmysql.c:
  Added connect_timeout
myisam/mi_check.c:
  Fixed warning i CHECK TABLE
myisam/mi_create.c:
  cleanup
sql-bench/bench-init.pl.sh:
  Updated version
sql/ha_berkeley.cc:
  Fixed bug in transaction pre statement
sql/sql_select.cc:
  removed 'explain' from slow query log
support-files/mysql.server.sh:
  Added locks

sql/log_event.h:
  thread_id needs to be ulong
sql/sql_base.cc:
  log drop of temp tables after disconnect
  add info about original thread on the master to table_cache_key

while slave thread has temp tables - not hard to fix though, but it is time to go to bed

added a new test case for temp table replication and Slave_open_temp_tables
status variable.

Misc fixes


client/mysqltest.c:
  added disconnect command
mysql-test/create-test-result:
  fixed bugs so it actually works
mysql-test/t/include/master-slave.inc:
  establish alternate connections to master and slave
sql/mysql_priv.h:
  Slave_open_temp_tables
sql/mysqlbinlog.cc:
  fixed a bug in reading local binlogs
sql/mysqld.cc:
  added Slave_open_temp_tables status variable
sql/slave.cc:
  fixed freed memory reference in the error message
sql/sql_class.cc:
  slave_proxy_id
sql/sql_class.h:
  slave_proxy_id
sql/sql_parse.cc:
  small optimization - reorder eval in &&
BitKeeper/etc/ignore:
  Added mysql-test/r/3.23/rpl000001.b.result.reject mysql-test/r/3.23/rpl000012.result.reject to the ignore list
sql/sql_table.cc:
  added THD arg to rename_temporary_table
sql/unireg.h:
  the table_cache_key is now 4 bytes longer

into evoq.home.mwagner.org:/home/mwagner/work/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added mirror; adjusted some uref's.

Docs/manual.texi:
  Fixes to the newer ChangeLog entries.

Docs/manual.texi:
  More fixes to Developer section.

into tetra.uu.net:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  Fixed up the Developer section.

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


BitKeeper/etc/logging_ok:
  Auto converge

send_file() is more stack-friendly - changed large static buffer to alloc_root()
fixed my_b_seek() to work with WRITE_CACHE
test case to make sure the slave starts correctly after being stopped
truncated words file so the replication tests will take less time


mysql-test/r/3.23/rpl000001.b.result:
  truncated words file
mysql-test/r/3.23/rpl000004.b.result:
  truncated words file
mysql-test/std_data/words:
  truncated words file
BitKeeper/etc/ignore:
  Added mysql-test/rpl000011.test mysql-test/var/lib/mysql-bin.007 sql/share/norwegian/errmsg.sys sql/share/norwegian-ny/errmsg.sys to the ignore list
mysys/mf_iocache2.c:
  got my_b_seek() to work with WRITE_CACHE, at least the one used by the slave
sql/share/romanian/errmsg.sys:
  accidently touched the file
sql/slave.cc:
  converted FILE to IO_CACHE for master.info
sql/slave.h:
  FILE -> IO_CACHE for master.info
sql/sql_repl.cc:
  be nice to the stack - change a large stack buffer to be alloced with
  alloc_root in send_file()

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

Docs/manual.texi:
  Mirror list typo.

Docs/manual.texi:
  Added/Removed from mirrors list. Fixed typo in Contrib.

Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  SCCS merged

Give warning if we are using non transactional tables and do ROLLBACK
Porting of crash-me and benchmarks to FrontBase


Docs/manual.texi:
  Updates for 3.23.29
include/mysqld_error.h:
  New error messages
sql-bench/Data/ATIS/fconnection.txt:
  Name change because 'connection' was a reserved word in FrontBase
sql-bench/bench-init.pl.sh:
  Port to FrontBase
sql-bench/crash-me.sh:
  Port to FrontBase
sql-bench/server-cfg.sh:
  Port to FrontBase
sql-bench/test-ATIS.sh:
  Port to FrontBase
sql-bench/test-alter-table.sh:
  Port to FrontBase
sql-bench/test-big-tables.sh:
  Port to FrontBase
sql-bench/test-connect.sh:
  Port to FrontBase
sql-bench/test-create.sh:
  Port to FrontBase
sql-bench/test-insert.sh:
  Port to FrontBase
sql-bench/test-select.sh:
  Port to FrontBase
sql-bench/test-wisconsin.sh:
  Port to FrontBase
sql/ha_berkeley.cc:
  All statements are now run in a sub transaction
sql/ha_berkeley.h:
  All statements are now run in a sub transaction
sql/handler.cc:
  All statements are now run in a sub transaction
sql/handler.h:
  All statements are now run in a sub transaction
sql/mysql_priv.h:
  Moved QUERY_NO.. flags to unique numbers
sql/mysqld.cc:
  All statements are now run in a sub transaction
sql/net_pkg.cc:
  Added send_warning
sql/share/czech/errmsg.sys:
  New error messages
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.sys:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.sys:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.sys:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.sys:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.sys:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.sys:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.sys:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.sys:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.sys:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.sys:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.sys:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.sys:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.sys:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.sys:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.sys:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.sys:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.OLD:
  New error messages
sql/share/swedish/errmsg.sys:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/slave.cc:
  All statements are now run in a sub transaction
sql/sql_class.cc:
  All statements are now run in a sub transaction
sql/sql_class.h:
  All statements are now run in a sub transaction
sql/sql_delete.cc:
  Remember if we are using a non transactional table
sql/sql_insert.cc:
  Remember if we are using a non transactional table
sql/sql_load.cc:
  Remember if we are using a non transactional table
sql/sql_parse.cc:
  All statements are now run in a sub transaction
sql/sql_select.cc:
  Remember if we are using a non transactional table
sql/sql_table.cc:
  All statements are now run in a sub transaction
sql/sql_update.cc:
  All statements are now run in a sub transaction
sql/sql_yacc.yy:
  All statements are now run in a sub transaction

Docs/manual.texi:
  Added documentation.

Docs/manual.texi:
  Howard's grammar changes

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

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

    cleanup - remove unneeded daeamon restarts
sql/log_event.cc
    fixed bug - do not confuse confused slaves even further if they try to 
    read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc
    give error if constructor fails
sql/mysqld.cc
    --disconnect-slave-event-count for replication debugging
sql/slave.cc
    --disconnect-slave-event-count
    cleanup to remove unneeded sleeps when things go wrong - sleep only 
    when we have to
sql/slave.h
    --disconnect-slave-event-count

test cases for ALTER TABLE ORDER BY and replication offset off by 22 
confusion mystery bug (both pass)


mysql-test/mysql-test-run:
  cleanup - remove unneeded daeamon restarts
sql/log_event.cc:
  fixed bug - do not confuse confused slaves even further if they try to 
  read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc:
  give error if constructor fails
sql/mysqld.cc:
  --disconnect-slave-event-count for replication debugging
sql/slave.cc:
  --disconnect-slave-event-count
  cleanup to remove unneeded sleeps when things go wrong - sleep only 
  when we have to
sql/slave.h:
  --disconnect-slave-event-count
sql/sql_repl.cc:
  added unknown error