include/my_global.h:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged

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 security patch ML7 problem in errno when it should be EEXIST


innobase/srv/srv0start.c:
  Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST

innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  SCCS merged

  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

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


innobase/os/os0file.c:
  Auto merged

  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.

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  lqh to forward abort within ng

into mysql.com:/space/pekka/ndb/version/my41

See mysqldump.test diff for more details

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge error?

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


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  typo - use of global var, spotted by mikael

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

sql/sql_union.cc:
  a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used)
  Don't touch options as itit's not needed.

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


sql/mysqld.cc:
  Auto merged

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


sql/mysql_priv.h:
  new var slave_transaction_retries
sql/mysqld.cc:
  new variable slave_transaction_retries. Plus fixing a typo.
sql/set_var.cc:
  new global variable slave_transaction_retries (will be one per subslave, when we have multimaster).
sql/slave.cc:
  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 (--slave_transaction_retries).
sql/slave.h:
  new RELAY_LOG_INFO::trans_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.


myisam/mi_open.c:
  Bug#8306 - TRUNCATE leads to index corruption
  Made test_if_reopen() globally available.
myisam/myisamdef.h:
  Bug#8306 - TRUNCATE leads to index corruption
  Declared test_if_reopen() as globally available.
mysql-test/r/myisam.result:
  Bug#8306 - TRUNCATE leads to index corruption
  The test result.
mysql-test/t/myisam.test:
  Bug#8306 - TRUNCATE leads to index corruption
  The test case.

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


sql/ha_innodb.cc:
  Commit inserts to the temporary tables created by
  CREATE INDEX and DROP INDEX every 10,000 rows, similar
  to ALTER TABLE.
sql/ha_innodb.h:
  Remove duplicate declaration of srv_max_purge_lag.

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

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

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


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged

  set exec_flag in execTC_COMMITREQ so that api will get rollbackrep


ndb/include/ndbapi/NdbConnection.hpp:
  Make getConnectedNode public
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Fix TC_COMMITREQ in abort cases
ndb/test/ndbapi/testNodeRestart.cpp:
  Testcase for bug#8853
ndb/test/run-test/daily-devel-tests.txt:
  Testcase for bug#8853

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

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


sql/sql_select.cc:
  Auto merged

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


sql/sql_select.cc:
  Auto merged

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


mysql-test/r/show_check.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

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.

depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and 
unsigned integers.


mysql-test/r/bigint.result:
  Test case for BUG#8562
mysql-test/t/bigint.test:
  Test case for BUG#8562

the error to be sent to the client.


mysql-test/r/select_safe.result:
  Testcase for BUG#8726
mysql-test/t/select_safe.test:
  Testcase for BUG#8726
sql/sql_select.cc:
  Fix for BUG#8726: On ER_TOO_BIG_SELECT set JOIN::error to -1 to cause the error to be sent to the client.

mysql-test/r/ps.result:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/show_check.result:
  Auto merged
sql/sql_select.cc:
  Auto merged