mysql-test/r/query_cache.result:
  test of many merged tales
mysql-test/t/query_cache.test:
  test of many merged tales
sql/sql_cache.h:
  query with merged tables can depend of more then 255 tables

  Fix bug introduced in 4.0.13 and reported by Emic: if a CREATE TABLE ended in a comment, a memory overrun could happen


innobase/dict/dict0dict.c:
  Fix bug introduced in 4.0.13 and reported by Emic: if a CREATE TABLE ended in a comment, a memory overrun could happen

  innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc


sql/mysqld.cc:
  innodb_fast_shutdown CAN take an argument though it was not specified so in mysqld.cc

binary logging.


sql/repl_failsafe.cc:
  If the master is running without --log-bin, SHOW MASTER STATUS will return
  "empty set", i.e. row==0; we must test this before invoking row[0], or
  segfault.

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

so that it really tests replication of SET FOREIGN_KEY_CHECKS (previously
it used MyISAM).


mysql-test/r/rpl_insert_id.result:
  result update
mysql-test/t/rpl_insert_id.test:
  Make test use InnoDB, and added foreign keys to the table, so that it really tests 
  replication of FOREIGN_KEY_CHECKS.
  --disable_warnings because 4.1 prints a warning when the table type
  is not available.

  Merge
trx0trx.c:
  Print more info about a trx in SHOW INNODB status; try to find the bug reported by Plaxo
buf0buf.c:
  Check that page log sequence numbers are not in the future
log0recv.c, log0log.c:
  Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log


innobase/log/log0log.c:
  Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log
innobase/log/log0recv.c:
  Fixed a bug: if you used big BLOBs, and your log files were relatively small, InnoDB could in a big BLOB operation temporarily write over the log produced AFTER the latest checkpoint. If InnoDB would crash at that moment, then the crash recovery would fail, because InnoDB would not be able to scan the log even up to the latest checkpoint. Starting from this version, InnoDB tries to ensure the latest checkpoint is young enough. If that is not possible, InnoDB prints a warning to the .err log
innobase/buf/buf0buf.c:
  Check that page log sequence numbers are not in the future
innobase/trx/trx0trx.c:
  Print more info about a trx in SHOW INNODB status; try to find the bug reported by Plaxo
innobase/fil/fil0fil.c:
  Merge
innobase/fsp/fsp0fsp.c:
  Merge
innobase/include/fil0fil.h:
  Merge
innobase/include/log0log.h:
  Merge
innobase/include/log0recv.h:
  Merge
innobase/os/os0file.c:
  Merge
innobase/srv/srv0srv.c:
  Merge

into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.fix

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

just a flush_relay_log_info() at the end of CHANGE MASTER
(there was already flush_master_info()).


sql/sql_repl.cc:
  Comments.
  Flush relay-log.info after CHANGE MASTER, or the changes
  to the relay log parameters (relay log name and position, and
  the corresponding master's binlog name and position) will be
  lost if the slave mysqld is shutdown immediately after the 
  CHANGE MASTER (without the slave threads being started).

I extended the task to cleaning error messages, making them look nicer,
and making the output of SHOW SLAVE STATUS (column Last_error) be as complete
as what's printed on the .err file;
previously we would have, for a failure of a replicated LOAD DATA INFILE:
- in the .err, 2 lines:
"duplicate entry 2708 for key 1"
"failed loading SQL_LOAD-5-2-2.info"
- and in SHOW SLAVE STATUS, only:
"failed loading SQL_LOAD-5-2-2.info".
Now SHOW SLAVE STATUS will contain the concatenation of the 2 messages.


sql/log_event.cc:
  Print the default database when replication stops because of an error. Previously, we had:
  "error "Duplicate entry 87987 for key 1", query 'insert into t values(87987)'", ie the db
  was not mentioned, making it hard for cases where the same table name is used in
  several databases.
  Lengthened some error messages (for failing replication of LOAD DATA: mention the table
  and the db).
  Changes so that SHOW SLAVE STATUS reports as complete errors as the .err file.
sql/slave.cc:
  Removed a useless declaration (the rewrite_db() function is already declared in slave.h).
  Added missing ')' in error messages.
  Tried to make error messages look nicer (previously we had
  "do START SLAVE;, error_code=1062"
  now we'll have
  "do START SLAVE; . Error_code=1062".
  This form has been discussed, I agree it's no panacea, but it's still more readable
  like this. To be improved in the future :)
sql/slave.h:
  declarations.

into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.fix

Here is fix for bug 554.
Added configure options 
--with-openssl-includes[=DIR] and --with-openssl-libs[=DIR]


acinclude.m4:
  Bug #554: Support for --with-openssl[=DIR]

 - bumped up version number in configure.in to 4.0.15

  Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart


innobase/btr/btr0cur.c:
  Fix bug: if there was a 'record too long' error in an insert, InnoDB forgot to free reserved file space extents; they were only freed in mysqld restart

  Fix an error in the previous push


innobase/btr/btr0cur.c:
  Fix an error in the previous push

  Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139


innobase/btr/btr0cur.c:
  Fix bug reported by Dyego Souza do Carmo: if a row becomes too long, > 8000 bytes, in an update, then InnoDB simply removes the clustered index record and does not report of table handler error 139

myisam/mi_locking.c:
  Here we use F_EXTRA_LCK
myisam/myisamchk.c:
  lines of "locking - emulation" replaced with mi_lock_database call
myisam/myisamdef.h:
  no need for MI_TEMPORARY_TABLE
sql/ha_myisam.cc:
  We use F_WRLCK instead MI_TEMPORARY_TABLE

into deer.(none):/home/hf/work/mysql-4.0

into mashka.(none):/home/my/mysql-4.0

acinclude.m4:
  Fixed problem with openssl on RedHat 9
vio/viosocket.c:
  Removed compiler warning
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

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

into narttu.mysql.fi:/my/mysql-4.0

Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR


myisam/mi_check.c:
  Fixed memory overrun in _mi_put_key_in_record
myisam/mi_key.c:
  Fixed unnecessary memory allocation
mysql-test/r/insert_select.result:
  Added test case for memory corruption
mysql-test/t/insert_select.test:
  Added test case for memory corruption
mysys/safemalloc.c:
  Removed compiler warnings
sql/sql_acl.cc:
  Fixed core dump when running with --debug

mysql-test/r/ctype_latin1_de.result:
  testing overlapping combos
mysql-test/t/ctype_latin1_de.test:
  testing overlapping combos

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_683/mysql-4.0

   as requested by PeterZ


support-files/my-innodb-heavy-4G.cnf.sh:
   - heavily reworked the comments and layout as requested by PeterZ

   a node name was changed in manual.texi which resulted in a very large
   ReadMe.txt file, as the generating script could not find the (renamed)
   ending node. Fixed the ending node name in Docs/Makefile.am and the 
   Docs/Support/generate-text-files.pl Perl script to make sure this does
   not happen again (I only discovered this because the Do-pkg script was
   not able to add the ReadMe.txt to the Apple Disk image because it ran out
   of disk space due to the size of the file)


Docs/Makefile.am:
   - Fixed a node name that was changed in manual.texi and resulted in
     the generation of a _very_ large ReadMe.txt file (down to the very end
     of the manual, since the ending node was not found)
Docs/Support/generate-text-files.pl:
   - added a safeguard: if the ending node was not found, abort with an error
     to indicate that the generated text file might be too large (as it would
     contain the whole manual, down from the starting node)
   - made some cosmetical changes

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


sql/handler.cc:
  Auto merged

myisammrg/myrg_open.c:
  never mark merge table as readonly even if all underlying myisam tables are readonly,
  otherwise ALTER TABLE merge UNION=(t1,t2,t3,...) will not work
sql/handler.cc:
  map EACCES to ER_OPEN_AS_READONLY.
  can only happen on modifying merge table that has (some) read-only myisam tables