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

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

  Fix test for classic builds

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

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

incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)

  Remove wrong assertion that fails on 64 bits

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

  Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed