include/my_pthread.h:
  Fix for HPUX
mysql-test/mysql-test-run.sh:
  Wait for socket instead of pid file
mysys/my_static.c:
  Portability fix (for OSF1)
mysys/raid.cc:
  Portability fix (for OSF1)
sql/mysqld.cc:
  Fixed typo for FreeBSD.
strings/bcmp.c:
  Fix for purify

Docs/manual.texi:
  Auto merged

Fix compile problem in sql_cache.cc


sql/mysqld.cc:
  Don't use symlinks if you are using HAVE_purify
sql/sql_cache.cc:
  Don't call bins_dump() when not debugging.

Fixed shutdown on HPUX.
Fixed bug in query cache.


Docs/manual.texi:
  Changelog
configure.in:
  Fixes for HPUX
include/m_string.h:
  Fixes for Purify
include/my_pthread.h:
  Fixes for HPUX
include/raid.h:
  Portability fix.
innobase/include/univ.i:
  Portability fix.
mysql-test/mysql-test-run.sh:
  Added --manual-gdb
mysql-test/r/rpl_log.result:
  Portability fix
mysql-test/t/rpl_log.test:
  Portability fix
mysys/my_pthread.c:
  Portability fix (HPUX)
mysys/raid.cc:
  Portability fix
mysys/thr_mutex.c:
  Portability fix
scripts/mysql_install_db.sh:
  Clean up install message
sql-bench/test-alter-table.sh:
  Fix testsuite
sql/ha_innobase.cc:
  Fixed stack overwrite.
sql/log_event.cc:
  Fixed purify warning
sql/mysqld.cc:
  Added patch from FreeBSD port.
  Fixed shutdown on HPUX.
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_cache.h:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_parse.cc:
  Optimize
tools/mysqlmanager.c:
  Portability fix

  Removed a mirror in Netherlands
manual.texi:
  Remove link to outdated mod_log_mysql


Docs/manual.texi:
  Remove link to outdated mod_log_mysql
Docs/mirrors.texi:
  Removed a mirror in Netherlands

horrible bug fixed


mysql-test/r/fulltext_multi.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_order_by.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_update.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_var.result:
  Change mode to -rw-rw-r--
mysql-test/r/bulk_replace.result:
  Change mode to -rw-rw-r--
mysql-test/r/handler.result:
  Change mode to -rw-rw-r--
include/my_global.h:
  FreeBSD fix for openssl
myisam/ft_static.c:
  some boolean search operators added
sql/sql_parse.cc:
  fixed horrible bug that makes mysqld CRASH when mysql client is started

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

libmysqld/lib_sql.cc:
  Fix for new bitmap
mysql-test/r/rpl_get_lock.result:
  Fix results after merge
mysql-test/r/rpl_skip_error.result:
  Fix results after merge
sql/log_event.cc:
  Finish merge of slave.cc
sql/slave.cc:
  Finish merge

extra/resolve_stack_dump.c:
  Auto merged
include/my_bitmap.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged

client/mysqltest.c:
  --replace_result can now use variables
mysql-test/r/rpl000014.result:
  Fix to use new replace
mysql-test/r/rpl000015.result:
  Fix to use new replace
mysql-test/r/rpl000016.result:
  Fix to use new replace
mysql-test/r/rpl_log.result:
  Fix to use new replace
mysql-test/t/join.test:
  Fix to use new replace
mysql-test/t/rpl000014.test:
  Fix to use new replace
mysql-test/t/rpl000015.test:
  Fix to use new replace
mysql-test/t/rpl000016.test:
  Fix to use new replace
mysql-test/t/rpl_log.test:
  Fix to use new replace
readline/rltty.c:
  Add missing function

sql/mysqld.cc:
  Auto merged

  Add diagnostic code to find out why foreign key constraint creation sometimes fails


innobase/dict/dict0crea.c:
  Add diagnostic code to find out why foreign key constraint creation sometimes fails

  Remove a theoretical overrun in adaptive hash index building


innobase/include/rem0rec.ic:
  Remove a theoretical overrun in adaptive hash index building

  Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized


innobase/buf/buf0buf.c:
  Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized

into hynda.mysql.fi:/data/my/bk/mysql-4.0-quick-fixes

client/mysql.cc:
  Fixed a bug with XML in mysql.cc

Added new tests to testsuite.


extra/resolveip.c:
  Portabilit fix.
mysql-test/create-test-result:
  Fix for new mysql-test-run
mysql-test/r/query_cache.result:
  Updated benchmarks
mysql-test/t/query_cache-master.opt:
  Updated benchmarks
mysql-test/t/query_cache.test:
  Updated benchmarks
sql/sql_cache.cc:
  Removed not used functions
sql/sql_cache.h:
  Removed not used functions

Docs/manual.texi:
  Auto merged

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

Docs/manual.texi:
  fixed bad merge
include/my_bitmap.h:
  fixed comment format
mysql-test/r/rpl_get_lock.result:
  make the test results predicable
mysql-test/t/rpl_get_lock.test:
  predicatable test results
mysys/my_bitmap.c:
  do not init/destroy mutex if bitmap is not declared thread safe
sql/slave.cc:
  clean-up suggested by Monty to make init_slave_skip_errors() more compact

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

BitKeeper/deleted/.del-section.Comparisons.texi~692b647b:
  Delete: Docs/section.Comparisons.texi

Docs/Makefile.am:
  Remove dummy files.

sql-bench/bench-init.pl.sh:
  Add new options.
sql/mysqld.cc:
  Fix --des-key-file
support-files/mysql.spec.sh:
  Always compile with --enable-thread-safe-client

sql/mysqld.cc:
  Auto merged

Add 4.0 commands to SHOW STATUS.


Docs/manual.texi:
  Cleanup
mysql-test/r/innodb.result:
  Fixe results
sql/mysqld.cc:
  Add commands unique for 4.0
sql/sql_lex.h:
  Cleanup
sql/sql_parse.cc:
  Cleanup
sql/sql_show.cc:
  Fix that SHOW STATUS works with SSL.
sql/sql_yacc.yy:
  Cleanup

innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
Docs/manual.texi:
  Merge

BUILD/compile-pentium-debug-max:
  Compile with openssl
mysql-test/r/innodb.result:
  New test result

Docs/manual.texi:
  Changelog

Docs/manual.texi:
  ChangeLog

New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.


Docs/Makefile.am:
  Add missing files
Docs/manual.texi:
  Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
  Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
  Removed compiler warnings
mysql-test/mysql-test-run.sh:
  Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
  Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
  Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
  Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
  Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
  New tests
mysql-test/t/func_str.test:
  Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
  Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
  New HEX() function
sql/item_strfunc.cc:
  Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
  New HEX() function
sql/item_timefunc.cc:
  cleanup
sql/lex.h:
  FLUSH DES_KEY_FILE
sql/mysql_priv.h:
  FLUSH DES_KEY_FILE
sql/mysqld.cc:
  FLUSH DES_KEY_FILE
sql/sql_parse.cc:
  Cleanup sql_yacc.yy
sql/sql_yacc.yy:
  Cleanup sql_yacc.yy

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

added extra/mysql_install.c - will work on it in 4.0, but it does not hurt
to have it sit in 3.23 tree for now since it will eventually be backported 
to 3.23 anyway 


Docs/manual.texi:
  documented slave-skip-errors
  updated change history
extra/resolve_stack_dump.c:
  fixed wrong help message
include/my_bitmap.h:
  bitmap code updates
mysql-test/r/rpl_get_lock.result:
  test for a possible bug in release_lock() replication
mysql-test/t/rpl_get_lock.test:
  test for possible bug in release_lock replication
mysys/my_bitmap.c:
  bitmap code updates/clean-up
sql/mysqld.cc:
  slave-skip-errors
sql/slave.cc:
  slave-skip-errors
sql/slave.h:
  slave skip errors

sql/Makefile.am:
  Added missing header file
sql/des_key_file.cc:
  Fixed compiler errors
sql/item_strfunc.cc:
  Fixed compiler errors
sql/lex.h:
  Portablity fix
sql/mysql_priv.h:
  Fixed wrong type
sql/sql_yacc.yy:
  Portablity fix