mysys/hash.c:
  The Sun C compiler insists on seeing 'static inline', or else it will not resolve the symbol.

to 'libmysql/net.c'.


sql/net_serv.cc:
  Even though this is (by name) a C++ file, it is later symlinked to 'libmysql/net.c'
  and so the source will be treated as plain C: No C++ comments in here!

include/my_sys.h:
  There are platforms which use '#define errno ...' and then cause a collision with
  'extern int errno;', one example is OpenBSD.
  Rather than treat them explicitly by the 'HAVE_ERRNO_AS_DEFINE', we can check for these
  by using '#ifndef errno'.
  (Backported from 5.0, as the problem was discovered there first.)

Added a missing comma.

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

include/my_global.h:
  O_NOFOLLOW
isam/create.c:
  create table files with O_EXCL|O_NOFOLLOW
merge/mrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
myisam/mi_create.c:
  create files of temporary tables with O_EXCL|O_NOFOLLOW
myisammrg/myrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
mysys/mf_tempfile.c:
  create temporary files with O_EXCL|O_NOFOLLOW
sql/ha_myisam.cc:
  let mi_create know if the table is TEMPORARY
sql/mysql_priv.h:
  --allow_suspicious_udfs
sql/mysqld.cc:
  --allow_suspicious_udfs
sql/share/english/errmsg.txt:
  typo
sql/sql_udf.cc:
  --allow_suspicious_udfs
  don't allow xxx() udf without any of xxx_init/deinit/add/reset
  check paths when loading from mysql.func
sql/table.cc:
  create frm of temporary table with O_EXCL|O_NOFOLLOW

  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


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

  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.


innobase/os/os0file.c:
  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.

innobase/include/srv0srv.h:
  Declare srv_auto_extend_increment and srv_max_purge_lag as ulong,
  because ulint and ulong are of different size on Win64.
innobase/srv/srv0srv.c:
  Declare srv_auto_extend_increment and srv_max_purge_lag as ulong,
  because ulint and ulong are of different size on Win64.

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


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)

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


mysql-test/r/rpl_insert_id.result:
  Adding test to ensure that slave handles error statement gracefully.
mysql-test/t/rpl_insert_id.test:
  Adding test to ensure that slave handles error statement gracefully.
sql/log.cc:
  Setting error code to 0 for SQL statement prologue and epilogue.

  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