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


sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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.)


BitKeeper/triggers/post-commit:
  Suppress emails when there's no changes actually reported

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().


mysql-test/r/fulltext.result:
  Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
mysql-test/t/fulltext.test:
  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.


sql/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.
mysql-test/t/delete.test:
  Added a test case for bug #8392.
mysql-test/r/delete.result:
  Added a test case for bug #8392.

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


myisam/ft_nlq_search.c:
  Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

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



mysql-test/t/group_by.test:
  Remove empty line
vio/viosocket.c:
  Added function comment

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.


sql/sql_update.cc:
  Switching to using T_READ_NO_INSERT when the binlog is used.
sql/sql_yacc.yy:
  Switching to using T_READ_NO_INSERT when the binlog is used.

(Bug #5822)


sql/ha_innodb.cc:
  innobase_mysql_tmpfile(): pass mysql_tmpdir to create_temp_file(),
  so that the MySQL startup option tmpdir will be honored instead of
  the environment variable TMPDIR. (Bug #5822)

  Backport the column prefix memory corruption fix from 5.0


innobase/row/row0mysql.c:
  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.


mysql-test/r/distinct.result:
  Adjustment of the result file after the revision of the fix for bug #7520.

sql/sql_cache.cc:
  Fixed mistyping

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.


sql/table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.
mysql-test/r/select.result:
  After revision of the fix for bug #7520.

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.


sql/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.
mysql-test/t/select.test:
  Added a test case for bug #7520.
mysql-test/r/select.result:
  Added a test case for bug #7520.

BitKeeper/triggers/post-commit:
  Remove extra blank link

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

it also works on file names with special characters.


Build-tools/Do-compile:
  Ever and again, some test creates a file name with special characters that need to be
  escaped when passed to the shell; as this is not done, 'system("rm -f ...");' fails
  on them, the old test tree is not deleted, and the build fails.
  Prevent this by changing to Perl 'unlink()' which does not need escaping.

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

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


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Fix test for classic builds


mysql-test/t/multi_update.test:
  Bug#7310
    Ignore warnings for Bug#5837 test

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)


sql/item_strfunc.h:
  Add tmp_value member
sql/item_strfunc.cc:
  Always allocate a new string for QUOTE(), in case the field is being reused
  for multiple rows.
mysql-test/t/func_str.test:
  Add regression test
mysql-test/r/func_str.result:
  Add test results

  Remove wrong assertion that fails on 64 bits


innobase/include/eval0eval.ic:
  Remove wrong assertion that fails on 64 bits

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


sql/sql_parse.cc:
  Auto merged

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


innobase/include/rem0rec.ic:
  Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed

extra/replace.c:
  A fix (bug #7971: set_bit/clear_bit names conflict w/Linux kernel headers >= 2.6.9-rcxx)
  set_bit replaced with internal_set_bit
  clear_bit replaced with internal_clear_bit

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