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

  Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
os0file.c:
  Revert the AIX patch here

  AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.

into mysql.com:/home/psergey/mysql-4.0-look

into mysql.com:/home/bk/b8412-mysql-4.0

into mysql.com:/home/bk/b7879-mysql-4.0

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

into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0

any actual changes. (Often the case in merges where the only change involves
renumbering ChangeSet entries.)

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445

  Make a more informative platform info for Windows

  Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().

into rurik.mysql.com:/home/igor/dev/mysql-4.0-0

  Added a test case for bug #8392.
sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.

  Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)

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

This fixes also the reverse lookup bug introduced by the previous patch

reading tables in "complex" SQL statements. If inserts happen in a
table being read, the statements have no serialization order and the
change can therefore not be reproduced on the slave.

(Bug #5822)

epilogue to an SQL statement should not have an error code even
when the SQL statement itself has an error code.

  Backport the column prefix memory corruption fix from 5.0

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

  Adjustment of the result file after the revision of the fix for bug #7520.

into rurik.mysql.com:/home/igor/dev/mysql-4.0-0

  After revision of the fix for bug #7520.
table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.

into mysql.com:/M40/mysql-4.0

into rurik.mysql.com:/home/igor/dev/mysql-4.0-0

  Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.

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

it also works on file names with special characters.

into mysql.com:/usr/home/ram/work/4.0

Call file->extra() with HA_STATUS_CONST in mysqld_show_keys.
The fix will not be merged into 4.1/5.0 because they don't have this problem already.