errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.


mysql-test/lib/mtr_process.pl:
  Fix race (on some platforms) when killing processes.

  better error message on invalid config change


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Change error message...note that this is a guess

  ndb - error while restarting in dict
        improve error message when changed config leads to failed restart


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  improve error message

ndb/test/ndbapi/testDataBuffers.cpp:
  Make testDatabuffer clean up tables

  When scan is completed, but lqhkeyreq is outstanding on primary replica and
  starting node dies, scan will not be closed leading to error handling of failed
  node not completing


ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Set scan state to WAIT_LQHKEY_COPY when scan is finished but LQHKEYREQ is outstanding

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

netware/BUILD/compile-linux-tools:
  Fixed compilation problem with Linux tools.
scripts/make_binary_distribution.sh:
  Netware specific changes. Discard platform
  specific files and added a couple of missing files.
sql/tztime.cc:
  Code not ported to Netware yet.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/perror.def:
  Auto merged

New libc suggests doing this.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11

into mysql.com:/M41/mysql-4.1

 table' lockup".
 Changes from the innodb-4.1-ss11 snapshot.
 Do not call os_file-create_tmpfile() at runtime. Instead, create
 a tempfile at startup and guard access to it with a mutex.
 Also, fix bugs:
 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
 KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also, added test cases (also for bug 9802).


innobase/dict/dict0dict.c:
  Changes from the innodb-4.1-ss11 snapshot
innobase/dict/dict0load.c:
  Changes from the innodb-4.1-ss11 snapshot
innobase/include/dict0dict.h:
  Changes from the innodb-4.1-ss11 snapshot
innobase/include/dict0load.h:
  Changes from the innodb-4.1-ss11 snapshot
innobase/include/os0file.h:
  Changes from the innodb-4.1-ss11 snapshot
innobase/include/rem0cmp.h:
  Changes from the innodb-4.1-ss11 snapshot
innobase/include/srv0srv.h:
  Changes from the innodb-4.1-ss11 snapshot
innobase/rem/rem0cmp.c:
  Changes from the innodb-4.1-ss11 snapshot
innobase/row/row0ins.c:
  Changes from the innodb-4.1-ss11 snapshot
innobase/row/row0mysql.c:
  Changes from the innodb-4.1-ss11 snapshot
innobase/srv/srv0srv.c:
  Changes from the innodb-4.1-ss11 snapshot
innobase/srv/srv0start.c:
  Changes from the innodb-4.1-ss11 snapshot
libmysqld/ha_blackhole.cc:
  Changes from the innodb-4.1-ss11 snapshot
mysql-test/r/innodb.result:
  Changes from the innodb-4.1-ss11 snapshot
mysql-test/t/innodb.test:
  Changes from the innodb-4.1-ss11 snapshot
sql/ha_innodb.cc:
  Changes from the innodb-4.1-ss11 snapshot

Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com


mysql-test/r/rpl_until.result:
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com
mysql-test/t/rpl_until.test:
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com

  Error in abort handling in TC when timeout during abort
  


ndb/src/kernel/blocks/ERROR_codes.txt:
  New error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New error codes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont release transaction record to early
ndb/test/ndbapi/testNodeRestart.cpp:
  Test case
ndb/test/run-test/daily-basic-tests.txt:
  Test case

  Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes


ndb/include/ndb_version.h.in:
  Handle upgrade of bug fix
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code for delaying INCL_NODE_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
    by also waiting for starting nodes
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug#15632

handling so that indexes are closed before trying to commit the
transaction. (Bug #15536)


mysql-test/r/bdb.result:
  Add new results
mysql-test/t/bdb.test:
  Add new test
sql/sql_delete.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
sql/sql_insert.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
sql/sql_update.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().

  Fix typo in autotest script


ndb/test/run-test/daily-basic-tests.txt:
  Fix typo in autotest script

  Fix error in NF during NR


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/ERROR_codes.txt:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run updateNodeInfo if failed node is not in list of storedReplicas
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add dump for ERROR 5002 with specified table
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug#15587
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug#15587

into  devsrv-b.mysql.com:/space/magnus/my41-bug9535

latin5.xml:
  - Fixing order thee Turkish letters to conform Turkish rules.
  - All non-Turkish accented letters are mappend
    to their non-accented counterparts.


sql/share/charsets/latin5.xml:
  Bug#13421 problem with sorting turkish
  Fixing order to conform the Turkish rules.
  All non-Turkish accented letters are mappend to
  the non-accented counterparts.

into  devsrv-b.mysql.com:/space/magnus/my41-bug9535

   - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
    Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5()
etc will use 'ascii'
    - Comitting again, the old patch seems to have been lost.


mysql-test/r/func_misc.result:
  Test results updated
mysql-test/t/func_misc.test:
  Test case
sql/item_strfunc.h:
  Multiply max_length of Item_func_uuid with system_charset_info->mbmaxlen

into  mysql.com:/space/my/mysql-4.1


BitKeeper/triggers/post-commit:
  Auto merged

   internals@lists.mysql.com to reduce the noise on the internals list.

(Backport of an identical change from 5.0)


support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
  and the one already installed on the system for the "max" build which is also labeled "experimental".
  (Backport of an identical change from 5.0)

scripts/make_binary_distribution.sh:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Merged from 4.0.

client/mysql.cc:
  Fixed option name.
client/mysqladmin.c:
  Fixed option name.
client/mysqlbinlog.cc:
  Fixed option name.
client/mysqlcheck.c:
  Fixed option name.
client/mysqldump.c:
  Fixed option name.
client/mysqlimport.c:
  Fixed option name.
client/mysqlshow.c:
  Fixed option name.
isam/isamchk.c:
  Fixed option name.
myisam/myisamchk.c:
  Fixed option name.
myisam/myisampack.c:
  Fixed option name.
sql/sql_parse.cc:
  Fix problem with kill connection on NetWare.

into moonbone.local:/work/15028-bug-4.1-mysql

ndb/src/kernel/blocks/backup/Backup.cpp:
  If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
  all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
  error in FSAPPENDCONF is hit.
  
  This would mean that no error code was set for the backup and that it would
  be incomplete as not all IO had been written to disk before the node crash.
  This would not be reported to the user.
  
  So the backup would appear to succeed but it really didn't.
  
  The window for this is rather small though.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)

depending on table order

multi_update::send_data() was counting updates, not updated rows. Thus if one 
record have several updates it will be counted several times in 'rows matched'
but updated only once.

multi_update::send_data() now counts only unique rows.


sql/sql_update.cc:
  Fix bug#15028  Multitable update returns different numbers of matched rows
  depending on table order
  multi_update::send_data() now counts only unique rows.
mysql-test/t/update.test:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
mysql-test/r/update.result:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order

to be in the query cache. (BUG#14652)


mysql-test/r/query_cache.result:
  BUG#14652 test suite.
mysql-test/t/query_cache.test:
  BUG#14652 test suite.
sql/sql_cache.cc:
  We should skip beggining '(' characters when test query on possibility
  to be in the query cache.

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


sql/item.cc:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

into mysql.com:/home/gluh/MySQL/Merge/4.1