configure.in:
  Auto merged

Docs/manual.texi:
  Update for 3.23.27
configure.in:
  Fixed syntax error
include/m_string.h:
  bmove() was wrongly defined (old code was probably never executed)
myisam/mi_check.c:
  Fix for automatic repair
myisam/myisamchk.c:
  Fix for automatic repair
sql/ha_myisam.cc:
  Fix for automatic repair
sql/handler.cc:
  Fix for automatic repair
sql/mysqlbinlog.cc:
  Indentation
sql/sql_insert.cc:
  Move incrementation of thread_count to make things safer
sql/sql_parse.cc:
  Added a new state for bug tracking
sql/sql_select.cc:
  Increment created_tmp_disk_tables for each internal temporary
  MyISAM table.  Added path to some printf statements.

manual.texi	Added latin5 (turkish) character set
configure.in	Added latin5 (turkish) character set
latin5.conf	BitKeeper file /usr/local/src/my/work/sql/share/charsets/latin5.conf


configure.in:
  Added latin5 (turkish) character set
Docs/manual.texi:
  Added latin5 (turkish) character set
sql/share/charsets/Index:
  Added latin5 (turkish) character set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixes for MIT pthreads


Docs/manual.texi:
  Update for MIT pthreads and sockets
configure.in:
  Fixed MIT pthreads to use sockets
myisam/mi_check.c:
  Portability fix
myisam/sort.c:
  Portability fix
sql/handler.h:
  Give an error if you use a BLOB(X) where X > 255
sql/mysqld.cc:
  Fixed MIT pthreads to use sockets
sql/sql_table.cc:
  Give an error if you use a BLOB(X) where X > 255
sql/table.cc:
  Fixed problem with BDB tables without keys

    cosmetic change
sql/slave.cc@1.49
    cosmetic change


sql/slave.cc:
  cosmetic change

    buffer size fix + template instatiation


BitKeeper/etc/ignore:
  Added BitKeeper/etc/csets-in support-files/mysql-3.23.26-beta.spec to the ignore list
sql/slave.cc:
  buffer size fix + template instatiation

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Cleanups
client/sql_string.cc:
  Fixes for AIX
mit-pthreads/Changes-mysql:
  Changelog
mit-pthreads/config/configure.in:
  Fixes for NETBSD
mit-pthreads/config/configure:
  Fixes for NETBSD
mit-pthreads/gen/ctime.c:
  Fixes for NETBSD
mysys/my_pthread.c:
  Changed assert to dbug_assert
scripts/make_binary_distribution.sh:
  Removed mysql-test
scripts/safe_mysqld.sh:
  Forced --defaults-extra-file to be first argument to mysqld
sql/handler.h:
  Added INNOBASE database type
sql/item_func.h:
  Fixed core dump when using MATCH
sql/lex.h:
  Added INNOBASE database type
sql/mysqld.cc:
  Fix for future
sql/sql_yacc.yy:
  Added INNOBASE database type

Docs/manual.texi:
  fixed typo

Docs/manual.texi:
  added security clarification

Docs/manual.texi:
  Minor cleanups to recent change notes.

Docs/manual.texi:
  2 mirror additions.

BitKeeper/triggers/post-commit:
  fixed up post commit, let's see if it works

BitKeeper/triggers/post-commit:
  Change mode to -rwxrwxr-x

    added BitKeeper/etc/csets-out


BitKeeper/etc/ignore:
  added BitKeeper/etc/csets-out

Docs/bk.txt:
  clean up

    clean up - test of bk 2.0 to see if Monty's favorite bug got fixed.


Docs/bk.txt:
  clean up - test of bk 2.0 to see if Monty's favorite bug got fixed.

    update for public bk access info


Docs/manual.texi:
  update for public bk access info

ins000001.test	BitKeeper file /home/sasha/src/bk/mysql/mysql-test/t/3.23/ins000001.test
ins000001.result	BitKeeper file /home/sasha/src/bk/mysql/mysql-test/r/3.23/ins000001.result

    updated docs for SET SQL_LOG_BIN
client/mysqltest.c
    added support for expected error


Docs/manual.texi:
  updated docs for SET SQL_LOG_BIN
client/mysqltest.c:
  added support for expected error

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


BitKeeper/etc/logging_ok:
  Auto merged

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

sel000022.xml	Escaped &,< chars.
sel000021.xml	Escaped &,< chars.
sel000020.xml	Escaped &,< chars.
sel000011.xml	Escaped &,< chars.
sel000010.xml	Escaped &,< chars.
translate-tests	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/mybin/translate-tests
select.tst	Marked where `ok' tests end.
select.res	Added first 30 tests into test suite, left marker.
sel000004.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000004.result
sel000005.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000005.result
sel000006.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000006.result
sel000007.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000007.result
sel000008.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000008.result
sel000009.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000009.result
sel000010.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000010.result
sel000011.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000011.result
sel000012.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000012.result
sel000013.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000013.result
sel000014.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000014.result
sel000015.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000015.result
sel000016.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000016.result
sel000017.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000017.result
sel000018.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000018.result
sel000019.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000019.result
sel000020.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000020.result
sel000021.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000021.result
sel000022.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000022.result
sel000023.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000023.result
sel000024.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000024.result
sel000025.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000025.result
sel000026.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000026.result
sel000027.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000027.result
sel000028.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000028.result
sel000029.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000029.result
sel000030.result	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/r/3.23/sel000030.result
sel000015.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000015.xml
sel000010.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000010.xml
sel000011.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000011.xml
sel000020.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000020.xml
sel000021.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000021.xml
sel000012.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000012.xml
sel000013.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000013.xml
sel000014.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000014.xml
sel000016.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000016.xml
sel000017.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000017.xml
sel000018.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000018.xml
sel000019.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000019.xml
sel000022.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000022.xml
sel000029.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000029.xml
sel000023.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000023.xml
sel000024.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000024.xml
sel000025.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000025.xml
sel000026.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000026.xml
sel000027.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000027.xml
sel000028.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000028.xml
sel000009.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000009.xml
sel000008.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000008.xml
sel000007.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000007.xml
sel000006.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000006.xml
sel000005.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000005.xml
sel000004.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000004.xml
sel000030.xml	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/xml/tests/sel000030.xml
mysql-test_V1.9.pl	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/chew_on_this/mysql-test_V1.9.pl
stop-mysqld	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/mybin/stop-mysqld
start-mysqld	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/mybin/start-mysqld
select.res	BitKeeper file /home/mwagner/work/bk/mysql/mysql-test/chew_on_this/select.res


mysql-test/mybin/start-mysqld:
  ***MISSING WEAVE***
mysql-test/mybin/stop-mysqld:
  ***MISSING WEAVE***
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysql-test/chew_on_this/select.tst:
  Marked where `ok' tests end.
mysql-test/mybin/translate-tests:
  ***MISSING WEAVE***
mysql-test/xml/tests/sel000010.xml:
  Escaped &,< chars.
mysql-test/xml/tests/sel000011.xml:
  Escaped &,< chars.
mysql-test/xml/tests/sel000020.xml:
  Escaped &,< chars.
mysql-test/xml/tests/sel000021.xml:
  Escaped &,< chars.
mysql-test/xml/tests/sel000022.xml:
  Escaped &,< chars.
mysql-test/xml/tests/sel000029.xml:
  Escaped &,< chars.

Docs/manual.texi:
  merged

Docs/manual.texi:
  Update for release
include/config-win.h:
  Fixed typo
sql-bench/test-insert.sh:
  Fixed that the new tests works with --fast
sql/item_cmpfunc.cc:
  Fix of NULL values with '<>'

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

Docs/manual.texi:
  Update of automatic recover of MyISAM tables
myisam/mi_check.c:
  Let the repair function rename files; This made the rest of the recover code simpler.
myisam/mi_page.c:
  More debug information
myisam/myisamchk.c:
  Addapt to new mi_check code;  Fixed bug when a recover on RAID tables where aborted.
mysys/my_winthread.c:
  Portability fix
sql/ha_myisam.cc:
  Fix for automatic recover
sql/sql_table.cc:
  Close all instances of table before running recover / optimize

Docs/manual.texi:
  Clarifications
myisam/mi_check.c:
  Cleanup
myisam/myisamdef.h:
  Header file fix
sql/ha_myisam.cc:
  Fix for repair
sql/sql_base.cc:
  Fix for repair

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Updates for 3.23.26
include/Makefile.am:
  Install my_config.h
include/my_pthread.h:
  Fix for Ia64
myisam/mi_check.c:
  Wrong new record pos on dupplicate key error
myisam/mi_open.c:
  Fix for automatic repair
myisam/myisamchk.c:
  Fix for automatic repair
myisam/myisamdef.h:
  Fix for automatic repair
mysys/mf_tempfile.c:
  Fix usage of mkstemp
sql-bench/bench-init.pl.sh:
  Better help text
sql-bench/test-insert.sh:
  Fix for slow databases
sql/field.cc:
  Fix of default values for CREATE TABLE ... SELECT
sql/ha_berkeley.cc:
  Fix bug in BDB records_in_range
sql/ha_myisam.cc:
  Fix for automatic repair
sql/ha_myisam.h:
  Fix for automatic repair
sql/handler.cc:
  Fixes for innobase
sql/item_strfunc.cc:
  Fix for SUBSTR_INDEX and REPLACE
sql/log_event.h:
  Portability fix
sql/mysqld.cc:
  Added INNOBASE and fixes for automatic recover of MyISAM tables
sql/sql_base.cc:
  Fix for automatic repair
sql/sql_table.cc:
  Fix for IF EXISTS when used with CREATE TEMPORARY

Docs/manual.texi:
  Added an explanation to the end of FULLTEXT section

Docs/manual.texi:
  updates for RESET MASTER/SLAVE
sql/sql_insert.cc:
  bk thinks I changed something, probably inserted or deleted a space
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/field.h:
  Cleanup
sql/filesort.cc:
  Cleanup
sql/opt_range.cc:
  Remove index in use
sql/sql_base.cc:
  Allow Berkeley DB tables used only the index when the query only uses
  the index + data from the primary key
sql/sql_select.cc:
  Fix for left join optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

heap/hp_extra.c:
  Changed meaning of HA_EXTRA_RESET
include/my_base.h:
  Added HA_EXTRA_RESET_STATE
isam/extra.c:
  Changed meaning of HA_EXTRA_RESET
isam/pack_isam.c:
  Addapt to changed HA_EXTRA_RESET
merge/extra.c:
  Changed meaning of HA_EXTRA_RESET
myisam/mi_extra.c:
  Changed meaning of HA_EXTRA_RESET
myisam/myisampack.c:
  Addapt to changed HA_EXTRA_RESET
myisammrg/myrg_extra.c:
  Addapt to changed HA_EXTRA_RESET
sql/filesort.cc:
  Addapt to changed HA_EXTRA_RESET
sql/ha_berkeley.cc:
  Hidden primary key
sql/ha_berkeley.h:
  Hidden primary key
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changed max packet limit from 24M -> 16M

configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged