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

into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92

 table' lockup".
 Changes from the innodb-5.0-ss92 snapshot.
 Do not call os_file_create_tmpfile() at runtime. Instead, create
 all tempfiles at startup and guard access to them with mutexes.

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

  NOTE: only changes to test script

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

New libc suggests doing this.

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

note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet

into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
Null merge

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

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

into  mysql.com:/home/novo/MySQL/mysql-5.0

  * made the following changes for the generic 5.0 RPM spec file
  - Added zlib to the list of (static) libraries installed
  - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
  - Compile MySQL with bundled zlib
  - Fixed %packager name to "MySQL Production Engineering Team"

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

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

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

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

Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.

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
  

into  mysql.com:/home/alexi/dev/mysql-5.0-14614

  Post review corrections in comments.

 error message if database is changed.

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2

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

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

to Crash": the bug was that due to non-standard name
resolution precedence in stored procedures (See Bug#5967)
a stored procedure variable took precedence over a table column
when the arguments for VALUES() function were resolved.
The implementation of VALUES() function was not designed to work
with Item_splocal and crashed.
VALUES() function is non-standard. It can refer to, and
is meaningful for, table columns only. The patch disables SP 
variables as possible arguments of VALUES() function.

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

  Fix typo in autotest script

  Fix error in NF during NR

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

into  mysql.com:/home/dlenev/src/mysql-5.0-merges

into  mysql.com:/home/dlenev/src/mysql-5.0-merges