sql/ha_berkeley.cc:
  Auto merged
mysql-test/r/bdb.result:
  SCCS merged
mysql-test/t/bdb.test:
  SCCS merged

Added put_length() to get_length() and unpack_key() to pack_key().
Keys were packed with the minimum size of the length field for the key part and 
unpacked with length size of the base column. 
For the purpose of optimal key packing we have the method pack_key(), while rows are 
packed with pack(). Now keys are unpacked with unpack_key() and no longer with 
unpack() which is used for rows.


mysql-test/r/bdb.result:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added the test case results.
mysql-test/t/bdb.test:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added the test case.
sql/field.cc:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added put_length() to get_length() and unpack_key() to pack_key().
  Keys were packed with the minimum size of the length field for the key part and 
  unpacked with length size of the base column. 
  For the purpose of optimal key packing we have the method pack_key(), while rows are packed 
  with pack(). Now keys are unpacked with unpack_key() and no longer with unpack() which is 
  used for rows.
sql/field.h:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added put_length() to get_length() and unpack_key() to pack_key().
  The default implementation simply calls unpack() for those field types that don't need 
  a special key unpacking.
sql/ha_berkeley.cc:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Now keys are unpacked with unpack_key() and no longer with unpack() which is used for rows.
  For most field types, however, this simply calls unpack().

into mysql.com:/home/mydev/mysql-4.0-bug2688

  add typelib.h to filelist
Clients and Tools.fgl:
  add libmysql.dll to file list
4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)


VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl:
  add libmysql.dll to file list
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl:
  add typelib.h to filelist

  Small fix to handle the src rpm file correctly (contains '0', release number in spec file)


Build-tools/Do-rpm:
  Small fix to handle the src rpm file correctly (contains '0', release number in spec file)

into mysql.com:/home/my/mysql-4.0

with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)


include/mysql.h:
  Make net_buffer_length visible for mysql clients
libmysql/libmysql.c:
  Make net_buffer_length visible for mysql clients
mysql-test/mysql-test-run.sh:
  Don't give warning for some common 'safe' warnings
mysql-test/r/lowercase_table2.result:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
mysql-test/t/lowercase_table2.test:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
scripts/mysql_install_db.sh:
  Removed not used variable
sql/sql_table.cc:
  lower_case_table_names=2 (Keep case for table names) was not honored
  with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)

into hundin.mysql.fi:/home/marko/k/mysql-4.0

into here.mwagner.org:/Volumes/BK/mysql-4.0

into here.mwagner.org:/Volumes/BK/mysql-4.0-work

  Change behaviour to be like the md5sum in GNU coreutils


Build-tools/my_md5sum:
  Change behaviour to be like the md5sum in GNU coreutils

into mysql.com:/space/my/mysql-4.0

   (e.g. a fix for BUG#3507 and some modifications recommended
   by Andrea Suatoni and Joerg Behrens - thank you!)


acinclude.m4:
   - OpenSSL libs are installed in /usr/freeware/include and
     /usr/freeware/lib32 on SGI IRIX - expanded search list
man/mysqlaccess.1.in:
   - cosmetical fix
man/mysqldump.1.in:
   - cosmetical fix
mysys/hash.c:
   - portability fix: some compilers can't handle inlining of rec_hashnr
     (BUG#3507)
vio/test-sslserver.c:
   - portability fix for SGI MipsPro compiler: define client_len as
     "socklen_t" instead of "size_t"

dded code to clear the tail of the reference buffer if the actual key length 
is less than the maximum key length.


mysql-test/r/bdb.result:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added the test case results.
mysql-test/t/bdb.test:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added the test case.
sql/ha_berkeley.cc:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added code to clear the tail of the reference buffer if the actual key length 
  is less than the maximum key length.

  Document the handling of quoted strings


innobase/pars/pars0lex.l:
  Document the handling of quoted strings
innobase/pars/lexyy.c:
  Document the handling of quoted strings

into hundin.mysql.fi:/home/marko/k/mysql-4.0

into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0

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


mysql-test/r/range.result:
  Auto merged

into hundin.mysql.fi:/home/marko/k/mysql-4.0

mysql-test/r/innodb_cache.result:
  test of rollback one statement in transaction
mysql-test/t/innodb_cache.test:
  test of rollback one statement in transaction
sql/handler.cc:
  clear changed tables list only for total roll back

  InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable


innobase/mem/mem0dbg.c:
  InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable

into here.mwagner.org:/Volumes/BK/mysql-4.0-work


BitKeeper/etc/logging_ok:
  auto-union

  new file, simulates 'md5sum' as a perl script


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

  Improve documentation of mach_*write_*compressed()
mtr0log.ic, mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()


innobase/include/mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()
innobase/include/mtr0log.ic:
  Improve documentation of mlog_write_initial_log_record_fast()
innobase/include/mach0data.h:
  Improve documentation of mach_*write_*compressed()
innobase/include/mach0data.ic:
  Improve documentation of mach_*write_*compressed()

into hegel.txg:/home/miguel/bk/mysql-4.0

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

Don't pass --user to mysqld if --user is not used


netware/Makefile.am:
  Make it possible to use mysys functions in mysql_test_run.c
netware/mysql_test_run.c:
  Make it possible to use mysys functions in mysql_test_run.c
scripts/mysql_install_db.sh:
  Don't pass --user to mysqld if --user is not used

libmysql/libmysql.c:
  Auto merged

into mysql.com:/home/my/mysql-4.0

Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug #4157)


mysql-test/r/range.result:
  Test of range optimizer bug
mysql-test/t/range.test:
  Test of range optimizer bug
sql/opt_range.cc:
  Fixed unlikely bug in the range optimzer when using many IN() queries on
  different key parts. (Bug #4157)

  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base


innobase/mem/mem0dbg.c:
  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
innobase/include/mem0dbg.h:
  Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base

into mysql.com:/home/mysql_src/mysql-3.23


libmysql/libmysql.c:
  Auto merged

libmysql/libmysql.c:
  safety fix

  Put asserts that make sure srv_que_task_enqueue() is never called under MySQL


innobase/srv/srv0que.c:
  Put asserts that make sure srv_que_task_enqueu() is never called under MySQL
innobase/que/que0que.c:
  Put asserts that make sure srv_que_task_enqueu() is never called under MySQL

  Revert the patch that put log debug code behind UNIV_LOG_DEBUG


innobase/log/log0recv.c:
  Revert the patch that put log debug code behind UNIV_LOG_DEBUG

  Revert the patch that put log debug code behind UNIV_LOG_DEBUG
log0log.ic, log0recv.c, log0log.c, log0log.h:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version


innobase/log/log0log.c:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/log/log0recv.c:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/include/log0log.ic:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
innobase/include/log0log.h:
  Revert the patch that put log debug code behind UNIV_LOG_DEBUG