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

Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
pidfile, secondly it should be removed by the process that created it and _only_ if it's
certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
- Set state of an instance to STARTING _before_ calling instance->start()
- Check that pidfile of instance has been created before changing STARTING => STARTED
- Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself

into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new

Bug #18559 "log tables cannot change engine, and
            gets deadlocked when dropping w/ log on":
1) Add more generic error messages
2) Add new handlerton flag for engines, which support
   log tables
3) Remove (log-tables related) mutex lock in myisam to
   improve performance

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge

initialized prior to usage as well as deinitialized on shutdown.

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge

5.1.12.

  fix sigsegv

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.

Remove SHOW SCHEDULER STATUS command and migrate the
information output to `mysqladmin debug` (COM_DEBUG)

SHOW SCHEDULER STATUS was introduced in 5.1.11, provided
some debug information about event scheduler internals and
was enabled only in debug builds.

  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