typo/bad merge fixed
chmod a-x for man/*.1 files


man/isamchk.1:
  Change mode to -rw-rw-r--
man/mysqlaccess.1:
  Change mode to -rw-rw-r--
man/mysqladmin.1:
  Change mode to -rw-rw-r--
man/mysqld.1:
  Change mode to -rw-rw-r--
man/mysqldump.1:
  Change mode to -rw-rw-r--
man/mysqlshow.1:
  Change mode to -rw-rw-r--
man/perror.1:
  Change mode to -rw-rw-r--
man/safe_mysqld.1:
  Change mode to -rw-rw-r--
mysql-test/r/handler.result:
  new tests added
client/mysqltest.c:
  bug fixed: errors from handler.test (that is send_error()
  after send_fields) weren't catched by expected_errno
mysql-test/t/handler.test:
  typo fixed
sql/Makefile.am:
  bad merge fixed
sql/sql_yacc.yy:
  bad merge (?) fixed

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_delete.cc:
  Auto merged

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

Docs/manual.texi:
  HANDLER documented
mysql-test/t/handler.test:
  more tests

log0log.c	Change Innobase text to InnoDB
srv0start.c	Change Innobase text to InnoDB
srv0srv.c	Change Innobase text to InnoDB
ha_innobase.cc	Change Innobase text to InnoDB


sql/ha_innobase.cc:
  Change Innobase text to InnoDB
innobase/srv/srv0srv.c:
  Change Innobase text to InnoDB
innobase/srv/srv0start.c:
  Change Innobase text to InnoDB
innobase/log/log0log.c:
  Change Innobase text to InnoDB
innobase/log/log0recv.c:
  Change Innobase text to InnoDB
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BUILD/SETUP.sh:
  Changed to use -ffixed-ebp with -fomit-frame-pointer
BUILD/compile-pentium:
  Changed to use reckless flags as defaults as this appears to work
  good, even with stack-traces.
Build-tools/Do-all-build-steps:
  Innobase -> Innodb
Docs/manual.texi:
  Added information about -ffixed-ebp
scripts/safe_mysqld.sh:
  Added option --mysqld-version
  Use mysqld-max binary as default if installed and --mysqld or --mysqld-version
  is not used
support-files/mysql-max.spec.sh:
  Fixed bugs
support-files/mysql.spec.sh:
  Added Max package
tests/fork_big.pl:
  Added --user and --password

Docs/manual.texi:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Deleted a lot of old benchmark runs


BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_i686_xeon~3e820c28bf4af63a:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_i686_xeon~17854e751e1d9d1d:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_i686_xeon~64cc4b874cd6fabf:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_i686_xeon~290c2c3de9d8e6b:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_i686_xeon~ea19dc3ec55b3618:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_i686_xeon~50d15991293030ef:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_i686_xeon~c683ee4b9d214298:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_i686_xeon~ead3f11b46ac626f:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_i686_xeon~7525b23938631801:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_i686_xeon
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_my_SMP_i686~d275df58a04737c8:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_my_SMP_i686~d4766c7f8e70d7a2:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_my_SMP_i686~155a83b53c0e9d6:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_my_SMP_i686~f1127add9307098b:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_my_SMP_i686~45d2cdf9bea9cc37:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_my_SMP_i686~d46860c29c5d51ee:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_my_SMP_i686~e1771e0a164bc310:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_my_SMP_i686~ee2a063d66a183d:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_my_SMP_i686~b7552710d35202b6:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686
BitKeeper/deleted/.del-ATIS-mysql-3.21-Linux_2.2.1_i686~660fb76ed6ccfb6f:
  Delete: sql-bench/Results/ATIS-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-RUN-mysql-3.21-Linux_2.2.1_i686~f6fdd64859e11de9:
  Delete: sql-bench/Results/RUN-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-alter-table-mysql-3.21-Linux_2.2.1_i686~f6f7ccd7b3c35f97:
  Delete: sql-bench/Results/alter-table-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-big-tables-mysql-3.21-Linux_2.2.1_i686~baa649caba113497:
  Delete: sql-bench/Results/big-tables-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-connect-mysql-3.21-Linux_2.2.1_i686~c0c26d4320182d85:
  Delete: sql-bench/Results/connect-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-create-mysql-3.21-Linux_2.2.1_i686~51581b24f45e0f5c:
  Delete: sql-bench/Results/create-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-insert-mysql-3.21-Linux_2.2.1_i686~fd082017c7c57a6:
  Delete: sql-bench/Results/insert-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-select-mysql-3.21-Linux_2.2.1_i686~ed3687e713ff0571:
  Delete: sql-bench/Results/select-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-wisconsin-mysql-3.21-Linux_2.2.1_i686~8147dc16a1dc6c47:
  Delete: sql-bench/Results/wisconsin-mysql-3.21-Linux_2.2.1_i686
BitKeeper/deleted/.del-ATIS-mysql_3.21-Linux_2.0.35_i686~c25425e045ca8dfc:
  Delete: sql-bench/Results/ATIS-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-RUN-mysql_3.21-Linux_2.0.35_i686~ea8672d8473435:
  Delete: sql-bench/Results/RUN-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-alter-table-mysql_3.21-Linux_2.0.35_i686~762639f2560976bd:
  Delete: sql-bench/Results/alter-table-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-big-tables-mysql_3.21-Linux_2.0.35_i686~190e827e569c99a4:
  Delete: sql-bench/Results/big-tables-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-connect-mysql_3.21-Linux_2.0.35_i686~650abd213e6828c6:
  Delete: sql-bench/Results/connect-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-create-mysql_3.21-Linux_2.0.35_i686~df1b037d17b33587:
  Delete: sql-bench/Results/create-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-insert-mysql_3.21-Linux_2.0.35_i686~60c0965dff31db07:
  Delete: sql-bench/Results/insert-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-select-mysql_3.21-Linux_2.0.35_i686~5fadbac5f98696a:
  Delete: sql-bench/Results/select-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-wisconsin-mysql_3.21-Linux_2.0.35_i686~31703d40ea6b4f66:
  Delete: sql-bench/Results/wisconsin-mysql_3.21-Linux_2.0.35_i686
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686~3fa4d167cceff7e8:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686~712f52be5d195406:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686~93b78a85b720a186:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686~99daa1c5370d077d:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686~c92505d77e19d5ec:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686~9e7822f66df6aa76:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686~763edf9aec633f51:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686~a2e264d777b787d:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686~301a82b12a84922b:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.10_i686
BitKeeper/deleted/.del-ATIS-mysql-win98~cd0705815d3af451:
  Delete: sql-bench/Results-win32/ATIS-mysql-win98
BitKeeper/deleted/.del-RUN-mysql-win98~7f09e396772a8665:
  Delete: sql-bench/Results-win32/RUN-mysql-win98
BitKeeper/deleted/.del-alter-table-mysql-win98~e8743982f790462:
  Delete: sql-bench/Results-win32/alter-table-mysql-win98
BitKeeper/deleted/.del-big-tables-mysql-win98~99a1882effebbdf2:
  Delete: sql-bench/Results-win32/big-tables-mysql-win98
BitKeeper/deleted/.del-connect-mysql-win98~2a11d5e3dfc0bc67:
  Delete: sql-bench/Results-win32/connect-mysql-win98
BitKeeper/deleted/.del-create-mysql-win98~f66c2cb2909c4792:
  Delete: sql-bench/Results-win32/create-mysql-win98
BitKeeper/deleted/.del-insert-mysql-win98~6d6cafc85a6c837:
  Delete: sql-bench/Results-win32/insert-mysql-win98
BitKeeper/deleted/.del-select-mysql-win98~f370fac2d66a9faf:
  Delete: sql-bench/Results-win32/select-mysql-win98
BitKeeper/deleted/.del-wisconsin-mysql-win98~8b3da9c5c5d2365b:
  Delete: sql-bench/Results-win32/wisconsin-mysql-win98
BUILD/compile-pentium-debug-max:
  Innobase -> Innodb
BUILD/compile-pentium-max:
  Innobase -> Innodb
Docs/manual.texi:
  Innobase -> Innodb
acinclude.m4:
  Innobase -> Innodb
bdb/Makefile.in:
  Fix that make clean works
configure.in:
  Innobase -> Innodb
mysql-test/include/have_innodb.inc:
  Innobase -> Innodb
mysql-test/install_test_db.sh:
  Innobase -> Innodb
mysql-test/mysql-test-run.sh:
  Innobase -> Innodb
mysql-test/r/have_innodb.require:
  Innobase -> Innodb
mysql-test/r/innodb.result:
  Innobase -> Innodb
mysql-test/t/innodb.test:
  Innobase -> Innodb
scripts/mysql_install_db.sh:
  Innobase -> Innodb
scripts/mysqlhotcopy.sh:
  Remove some warnings
sql-bench/server-cfg.sh:
  Innobase -> Innodb
sql/Makefile.am:
  Innobase -> Innodb
sql/ha_innobase.cc:
  Innobase -> Innodb
sql/ha_innobase.h:
  Innobase -> Innodb
sql/handler.cc:
  Innobase -> Innodb
sql/mysqld.cc:
  Innobase -> Innodb
sql/sql_delete.cc:
  Innobase -> Innodb
support-files/my-huge.cnf.sh:
  Innobase -> Innodb
support-files/my-large.cnf.sh:
  Innobase -> Innodb
support-files/my-medium.cnf.sh:
  Innobase -> Innodb
support-files/my-small.cnf.sh:
  Innobase -> Innodb
support-files/mysql-max.spec.sh:
  Innobase -> Innodb
support-files/mysql.spec.sh:
  Innobase -> Innodb
tests/fork_big.pl:
  Added checking of whole database

Docs/manual.texi:
  Fix Bowser's birth date (1998 -> 1989)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    do REAL_EMAIL magic
mysql-test/mysql-test-run.sh
    added show_failed_diffs
mysql-test/r/bench_count_distinct.result
    tired of waiting :-)
mysql-test/r/rpl000001.result
    new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test
    tired of waiting
mysql-test/t/rpl000001.test
    implemented Monty's Hack (TM) to kill a query in the middle of update
    without generating a table with 30,000 rows. This will also avoice the
    timing uncertainty


BitKeeper/triggers/post-commit:
  do REAL_EMAIL magic
mysql-test/mysql-test-run.sh:
  added show_failed_diffs
mysql-test/r/bench_count_distinct.result:
  tired of waiting :-)
mysql-test/r/rpl000001.result:
  new test results after implementing Monty's Hack (TM)
mysql-test/t/bench_count_distinct.test:
  tired of waiting
mysql-test/t/rpl000001.test:
  implemented Monty's Hack (TM) to kill a query in the middle of update
  without generating a table with 30,000 rows. This will also avoice the
  timing uncertainty

Docs/manual.texi:
  Update about benchmarks
mysql-test/mysql-test-run.sh:
  Added intern which functions

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


BitKeeper/etc/logging_ok:
  auto-union

    use REAL_EMAIL
myisam/mi_search.c
    merged the dropped lines
ignore junk in libmysqld directory


BitKeeper/triggers/post-commit:
  use REAL_EMAIL
myisam/mi_search.c:
  merged the dropped lines
BitKeeper/etc/ignore:
  Added libmysqld/convert.cc libmysqld/derror.cc libmysqld/errmsg.c libmysqld/field.cc libmysqld/field_conv.cc libmysqld/filesort.cc libmysqld/get_password.c libmysqld/ha_berkeley.cc libmysqld/ha_heap.cc libmysqld/ha_isam.cc libmysqld/ha_isammrg.cc libmysqld/ha_myisam.cc libmysqld/ha_myisammrg.cc libmysqld/handler.cc libmysqld/hostname.cc libmysqld/init.cc libmysqld/item.cc libmysqld/item_buff.cc libmysqld/item_cmpfunc.cc libmysqld/item_create.cc libmysqld/item_func.cc libmysqld/item_strfunc.cc libmysqld/item_sum.cc libmysqld/item_timefunc.cc libmysqld/item_uniq.cc libmysqld/key.cc libmysqld/lock.cc libmysqld/log.cc libmysqld/log_event.cc libmysqld/md5.c libmysqld/mini_client.cc libmysqld/net_pkg.cc libmysqld/net_serv.cc libmysqld/opt_ft.cc libmysqld/opt_range.cc libmysqld/opt_sum.cc libmysqld/password.c libmysqld/procedure.cc libmysqld/records.cc libmysqld/slave.cc libmysqld/sql_acl.cc libmysqld/sql_analyse.cc libmysqld/sql_base.cc libmysqld/sql_cache.cc libmysqld/sql_class.cc libmysqld/sql_crypt.cc libmy

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
myisam/mi_search.c:
  the ugliest merge I've ever done! And I already see this has introduced a bug - will have to do a fix-up afterwards

BitKeeper/etc/logging_ok:
  auto-union

    reversed incorrect temporary change


mysql-test/t/rpl000015.test:
  reversed incorrect temporary change

start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized


Docs/manual.texi:
  updates for recent changes
mysql-test/r/rpl000001.result:
  update for test case change
mysql-test/t/rpl000001.test:
  fixed bugs in the test case
mysql-test/t/rpl000015.test:
  wrong change - to be reversed
sql/mysqld.cc:
  start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

myisam/ft_boolean_search.c:
  Cleanup
myisam/ft_parser.c:
  Cleanup
myisam/ft_update.c:
  Cleanup
myisam/sort.c:
  Cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/os/os0file.c:
  Change pwrite to os_file_pwrite to allow compilation if no pwrite
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/slave.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Updated MyODBC section
libmysql/conf_to_src.c:
  Fixed wrong typecast
mysql-test/r/func_regexp.result:
  Added test case for REGEXP bug
mysql-test/t/func_regexp.test:
  Added test case for REGEXP bug
regex/engine.c:
  Fixed wrong type
regex/regexec.c:
  Fixed wrong type
sql/records.cc:
  Fixed test of READ lock
sql/slave.cc:
  Cleanup

PSTACK, libmysqld and MySQL filesystem
UPDATE ... ORDER BY
DELETE ... ORDER BY
New faster fulltext handling
Faster compressed keys



Makefile.am:
  Added support for pstack and libmysqld_dir
acconfig.h:
  MySQL filesystem and PSTACK
acinclude.m4:
  MySQL File system
client/mysql.cc:
  Support for --xml
configure.in:
  Pstack, MySQL FS and libmysqld_dir
include/ft_global.h:
  Faster fulltext
include/my_pthread.h:
  Made c++ safe
include/myisam.h:
  Update for faster fulltext
include/mysql_com.h:
  new my_net_read()
include/violite.h:
  libmysqld
libmysql/net.c:
  New protocol that supports big packets
myisam/Makefile.am:
  Faster fulltext
myisam/ft_parser.c:
  Faster fulltext
myisam/ft_search.c:
  Faster fulltext
myisam/ft_update.c:
  Faster fulltext
myisam/ftdefs.h:
  Faster fulltext
myisam/mi_check.c:
  Faster fulltext
myisam/mi_open.c:
  Faster compressed keys
myisam/mi_search.c:
  Faster compressed keys
myisam/mi_update.c:
  Faster compressed keys
myisam/myisamdef.h:
  Faster compressed keys
myisam/sort.c:
  Faster compressed keys
mysql-test/mysql-test-run.sh:
  --skip-innobase and --skip-bdb
sql/ChangeLog:
  Changelog
sql/Makefile.am:
  PSTACK
sql/mysql_priv.h:
  New ORDER BY options and libmysqld
sql/mysqld.cc:
  PSTACK
sql/net_serv.cc:
  New protocol that supports big packets
sql/share/estonian/errmsg.txt:
  New error messages
sql/sql_base.cc:
  Better list_open_tabels
sql/sql_delete.cc:
  ORDER BY for delete
sql/sql_lex.cc:
  Added language convertation of all strings
sql/sql_parse.cc:
  Changes for libmysqld
  Use new ORDER BY options
sql/sql_show.cc:
  Character set convertations
  Use new list_open_tables function.
sql/sql_update.cc:
  UPDATE ... ORDER BY
sql/sql_yacc.yy:
  Clean up symbol definitions
  DELETE .. ORDER BY
  UPDATE .. ORDER BY
sql/table.h:
  new OPEN_TABLE_LIST structure
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


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

client/mysql.cc:
  Fixed a bug in pager + added feature that the default
  pager will be the last one used. This is invoked in mysql
  client monitor with pager command without argument.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mark killed partially completed updates with an error code in binlog
stop replication if the master reports a possible partial/killed update
test partially killed update


mysql-test/r/rpl000001.result:
  updated result
mysql-test/r/rpl000012.result:
  updated result
mysql-test/t/rpl000001.test:
  test handing a killed partial update
mysql-test/t/rpl000012.test:
  test temporary table replication more thoroughly
sql/log_event.h:
  mark killed partially completed updates with an error code
BitKeeper/etc/ignore:
  Added bdb/btree/btree_auto.c bdb/build_vxworks/db_int.h bdb/build_win32/db_int.h bdb/build_win32/include.tcl bdb/build_win32/libdb.rc bdb/db/crdel_auto.c bdb/db/db_auto.c bdb/dist/config.hin to the ignore list
sql/slave.cc:
  stop replication if the master reports a possible partial/killed update
sql/sql_base.cc:
  do not log the drop internal temporary tables into the binary log

os0thread.c	Set created thread priority to QUERY_PRIOR if specified
row0mysql.c	Drop table removes locks on the table, error handling changed
row0ins.c	Insert now always sets a shared lock on a duplicate or suspected duplicate record
lock0lock.h	Can remove locks from a table to be dropped
lock0lock.c	Can remove locks from a table to be dropped
srv0srv.c	Try to do log flush every second
srv0start.c	No need for a slash at the end of dir
trx0trx.h	Added an IGNORE option field to trx handle
trx0trx.c	Added an IGNORE option field to trx handle
ha_innobase.h	Added last_query_id field to handle
ha_innobase.cc	Fix drop table hang, roll-forward etc.


sql/ha_innobase.cc:
  Fix drop table hang, roll-forward etc.
sql/ha_innobase.h:
  Added last_query_id field to handle
innobase/trx/trx0trx.c:
  Added an IGNORE option field to trx handle
innobase/include/trx0trx.h:
  Added an IGNORE option field to trx handle
innobase/srv/srv0start.c:
  No need for a slash at the end of dir
innobase/srv/srv0srv.c:
  Try to do log flush every second
innobase/lock/lock0lock.c:
  Can remove locks from a table to be dropped
innobase/include/lock0lock.h:
  Can remove locks from a table to be dropped
innobase/row/row0ins.c:
  Insert now always sets a shared lock on a duplicate or suspected duplicate record
innobase/row/row0mysql.c:
  Drop table removes locks on the table, error handling changed
innobase/os/os0thread.c:
  Set created thread priority to QUERY_PRIOR if specified
innobase/include/srv0srv.h:
  Merging work for 3.23.37
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/ignore:
  added mysys/test_dir

Docs/manual.texi:
  Updated replication section
mysql-test/r/null_key.result:
  Added test UPDATE/DELETE with IS NULL on unique key
mysql-test/t/null_key.test:
  Added test UPDATE/DELETE with IS NULL on unique key
mysys/Makefile.am:
  Removed -f from $CP as this is not portable
  Fixed rule for testhash
sql/field.cc:
  Safety fix
sql/opt_range.cc:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL
sql/opt_range.h:
  Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL

    make table delay key write to speed things up a bit


mysql-test/t/bench_count_distinct.test:
  make table delay key write to speed things up a bit

added a benchmark test for count(distinct)


mysql-test/mysql-test-run.sh:
  u

ignore generated files from bdb


BitKeeper/etc/ignore:
  Added bdb/dist/template/rec_btree bdb/dist/template/rec_crdel bdb/dist/template/rec_db bdb/dist/template/rec_hash bdb/dist/template/rec_log bdb/dist/template/rec_qam bdb/dist/template/rec_txn bdb/hash/hash_auto.c bdb/include/btree_auto.h bdb/include/crdel_auto.h bdb/include/db_auto.h bdb/include/db_server.h bdb/include/hash_auto.h bdb/include/log_auto.h bdb/include/qam_auto.h bdb/include/txn_auto.h bdb/java/src/com/sleepycat/db/DbConstants.java bdb/log/log_auto.c bdb/qam/qam_auto.c bdb/rpc_client/db_server_clnt.c bdb/rpc_client/gen_client.c bdb/rpc_server/db_server_svc.c bdb/rpc_server/db_server_xdr.c bdb/rpc_server/gen_db_server.c bdb/test/include.tcl bdb/txn/txn_auto.c gmon.out mysql-test/gmon.out sql/gmon.out sql/share/charsets/gmon.out sql/share/gmon.out to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.


BitKeeper/deleted/.del-df_crash.result~4a3dbee64843953d:
  Delete: mysql-test/r/df_crash.result
BitKeeper/deleted/.del-df_crash.test~4c365178fe437f6:
  Delete: mysql-test/t/df_crash.test
Docs/manual.texi:
  Changelog
innobase/ib_config.h.in:
  automatic changed file
innobase/ib_config.h:
  automatic changed file
mysql-test/r/func_time.result:
  Test case for bug in time functions
mysql-test/r/innobase.result:
  Test for INSERT DELAYED
mysql-test/t/func_time.test:
  Test case for bug in time functions
mysql-test/t/innobase.test:
  Test for INSERT DELAYED
scripts/mysql_convert_table_format.sh:
  Added --socket and --port
sql/ha_innobase.cc:
  Fix bug when compiling with SAFE_MUTEX
  Cleaner comment when using SHOW TABLE STATUS
sql/mysqld.cc:
  Fix for shutdown on NT
sql/sql_insert.cc:
  Fixed problem with Innobase and INSERT DELAYED
sql/sql_udf.cc:
  Support for UDF on windows
sql/time.cc:
  Fixed bug when using wrong dates from blob field.
strings/ctype-tis620.c:
  Removed not used variable
support-files/mysql-max.spec.sh:
  Removed old not used section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/t/handler.test:
  LIMIT tests
sql/mysql_priv.h:
  HANDLER ... LIMIT added
sql/sql_handler.cc:
  HANDLER ... LIMIT added
sql/sql_parse.cc:
  HANDLER ... LIMIT added
sql/sql_yacc.yy:
  HANDLER ... LIMIT added

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

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