into  mysql.com:/usr/local/mysql/mysql-5.1-new

into  mysql.com:/usr/local/mysql/mysql-5.1-new

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

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

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

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.

  NOTE: only changes to test script

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.1-new

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/jimw/my/mysql-5.1-clean

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

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

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

  Put options in proper order.

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:/Users/kent/mysql/bk/mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1