into hundin.mysql.fi:/home/marko/mysql-4.1

  fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.

into mysql.com:/home/mydev/mysql-4.1-4100

into mysql.com:/home/mydev/mysql-4.1-4100

Added a missing comma.

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

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

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

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

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

  Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST

  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

into hundin.mysql.fi:/home/heikki/mysql-4.1

  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:/space/pekka/ndb/version/my41

See mysqldump.test diff for more details

Secondary weight out of bounds was picked up in mistake when
the string is empty, instead of returning 0.

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/psergey/mysql-4.1-bugs

hostnames to not be matched correctly. (Bug #3309)

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

into mysql.com:/home/mysql_src/mysql-4.1-clean

in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).

Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.

  row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)

CREATE INDEX and DROP INDEX every 10,000 rows,
similar to ALTER TABLE.

into mysql.com:/home/jonas/src/mysql-4.1