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

innobase/ibuf/ibuf0ibuf.c:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
mysql-test/t/rpl000015.slave-mi:
  Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
  Auto merged
mysql-test/mysql-test-run.sh:
  merge with 3.23
scripts/make_binary_distribution.sh:
  merge with 3.23
sql/share/czech/errmsg.txt:
  merge with 3.23
sql/share/danish/errmsg.txt:
  merge with 3.23
sql/share/dutch/errmsg.txt:
  merge with 3.23
sql/share/estonian/errmsg.txt:
  merge with 3.23
sql/share/swedish/errmsg.txt:
  merge with 3.23
sql/sql_class.cc:
  merge with 3.23 (Keep local copy)

mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
  Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt
mysql-test/t/rpl000015-slave-master-info.opt:
  Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt
mysql-test/r/bigint.result:
  New bigint test
mysql-test/t/bigint.test:
  New bigint test
netware/mysql_test_run.c:
  slave-master-info.opt -> .slave-mi

mysql-test/t/rpl_rotate_logs.slave-mi:
  Rename: mysql-test/t/rpl_rotate_logs-slave-master-info.opt -> mysql-test/t/rpl_rotate_logs.slave-mi
mysql-test/t/rpl000015.slave-mi:
  Rename: mysql-test/t/rpl000015-slave-master-info.opt -> mysql-test/t/rpl000015.slave-mi

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

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

BitKeeper/etc/ignore:
  added support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall

BUILD/compile-pentium-debug-max:
  Added -DBIG_TABLES
sql/mysqld.cc:
  Simple code cleanup

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

 - moved helper functions from Bootstrap script to logger.pm 


Build-tools/Bootstrap:
   - renamed logfile -> LOGFILE
   - moved functions abort() and run_command() to logger.pm for better
     reusability
Build-tools/Do-pkg:
   - heavily reworked: now make use of the logger.pm helper functions
   - added new options: --dry-run, --log, --mail, --verbose
Build-tools/logger.pm:
   - added functions run_command() and abort() from Bootstrap script for
     better code reusability
support-files/MacOSX/postinstall.sh:
   - made script more robust

 - tagged ChangeSet 1.1594 as "mysql-4.0.11"

Ensured that all errors messages ends with: ",


sql/share/czech/errmsg.txt:
  Fixed new line terminations
sql/share/danish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/dutch/errmsg.txt:
  Fixed "syntax" errors.
sql/share/english/errmsg.txt:
  Fixed "syntax" errors.
sql/share/estonian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/french/errmsg.txt:
  Fixed "syntax" errors.
sql/share/german/errmsg.txt:
  Fixed "syntax" errors.
sql/share/greek/errmsg.txt:
  Fixed "syntax" errors.
sql/share/hungarian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/italian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/japanese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/korean/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian-ny/errmsg.txt:
  Fixed "syntax" errors.
sql/share/norwegian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/polish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/portuguese/errmsg.txt:
  Fixed "syntax" errors.
sql/share/romanian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/russian/errmsg.txt:
  Fixed "syntax" errors.
sql/share/slovak/errmsg.txt:
  Fixed "syntax" errors.
sql/share/spanish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/swedish/errmsg.txt:
  Fixed "syntax" errors.
sql/share/ukrainian/errmsg.txt:
  Fixed "syntax" errors.

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

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

mysql_hot_copy when --checkpoint or --record-log-pos was used.

  Correct printf format


innobase/ut/ut0mem.c:
  Correct printf format

  Print correct OS error number also on Windows if we run out of memory


innobase/ut/ut0mem.c:
  Print correct OS error number also on Windows if we run out of memory

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

   3.23.x) and removed mirrors.texi again

  Correction for min/max optimization of queries with outer joins


sql/opt_sum.cc:
  Correction for min/max optimization of queries with outer joins
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

fixed error handling in HANDLER ... READ FIRST


sql/sql_handler.cc:
  fix error handling in HANDLER ... READ FIRST
sql/sql_table.cc:
  ALTER TABLE closes all open HANDLER's for the table in question

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

ALTER TABLE ... ADD KEY

  Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records


innobase/ibuf/ibuf0ibuf.c:
  Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records

   configure.in - there are 32bit installations of HPUX11 out there
   and compiling for these by manually adding +DAportable to CFLAGS
   did not work. Better add +DD64 manually, if you need it.

   builds and until I've found a way on how to add this conditionally

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