into mysql.com:/M40/mysql-4.0

without trying to re-run autotools.
(Backport from 4.1.7 for 4.0.22)

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

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

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

crashes server"

(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).

  Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway

  Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users

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

Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)

  test

  Add note to mysql_hex_string() comment.

  New function mysql_hex_string()

into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0

  BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.

into mysql.com:/home/hartmut/projects/mysql/dev/4.0

  Change parsing of @image argument.

so lets get rid of it (Bug #6112)

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

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

Added a try to a normal repair() if repair_by_sort() failed.
This was not done with ENABLE KEYS and OPTIMIZE TABLE.
Fixed error code handling in mysql_alter_table().

innodb_table_locks_old_behavior: do not acquire an
InnoDB table lock for LOCK TABLES, as in mysql-4.0.18
and earlier.

  Change error code to HA_ERR_ROW_IS_REFERENCED if we cannot DROP a parent table referenced by a FOREIGN KEY constraint; this error number is less misleading than the previous value HA_ERR_CANNOT_ADD_FOREIGN, but misleading still; we should introduce to 5.0 a proper MySQL error code

into hundin.mysql.fi:/home/heikki/mysql-4.0

into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack

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

when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.

  Fix bug #5960: if one updated a column so that its size changed, or updated it to an externally stored (TEXT or BLOB) value, then ANOTHER externally stored column would show up as 512 bytes of good data + 20 bytes of garbage in a consistent read that fetched the old version of the row

(Fixed this by backporting some logic from 4.1)

in the error monitor thread.  (Bug #5898)

into build.mysql.com:/users/rburnett/mysql-4.0

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733