into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-clean

 tables to INFORMATION_SCHEMA.

- compiler warning
- detection of pthread_create failure (you will see this message
only if you run with "make test-verbose" in unittest; otherwise
unit.pl masks all messages from the test but "ok" ones.
- the test fails randomly on some machines (I filed it as BUG#22320),
on one host it looks like a crash at exit() which a sleep(2) makes
disappear. So I add the sleep(2), which can be removed
when BUG#22320 is fixed. 

 tables to INFORMATION_SCHEMA.

into  lamia.home:/home/timka/mysql/src/5.1-dbg

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51

The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.

The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.

Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work

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

(as part of the auto_increment cleanup of WL#3146; let's not be
sad, that monster push still removed serious bugs):
one problem with INSERT DELAYED (unexpected interval releases),
one with stored functions (wrong auto_inc binlogging).
These bugs were not released.

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

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

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

into  naruto.:C:/cpp/mysql-5.1-maint

 - When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.

  Fixing failed merge

More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl

Adding files to CMakeLists.txt

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

 - Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
   This is inline with how it's done in other handlers.

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl

into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint