into  zim.(none):/home/brian/mysql/merge-5.1

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

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  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

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  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. 

into  zim.(none):/home/brian/mysql/merge-5.1

fixed multiple and missing deinitializations, moved all
deinit/del code in one place

remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version

  Update of Dutch errmsg translations (not complete yet)
errmsg.h:
  Fixup of changed error message file path in comment
authors.h:
  Ego add.

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

into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913

into  maint1.mysql.com:/data/localhome/tsmith/bk/51

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx

into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx

into  rama.(none):/home/jimw/my/mysql-5.1-clean