Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.

  Fix bad root element name in DOCTYPE.  Sheesh.

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0

  dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.

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

- bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
  as 4.0.24)

correct the definition of srv_max_buf_pool_modified_pct.

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0.7498

to 'libmysql/net.c'.

Added a missing comma.

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.