into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0

into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge

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

  Backporting a changeset made for 5.0. Comments from there:

  The fix refines the algorithm of generating DROPs for binlog.
  Temp tables with common pseudo_thread_id are clustered into one query.
  Consequently one replication event per pseudo_thread_id is generated.

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

into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2

Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.

This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors. 

With this fix we explicitly use pointer to the beginning of main select's
table list.

  Make InnoDB option "loose", as the server might be
  started with this option just to find out the test
  is to be skipped in the configuration (bug#17359)

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into  rurik.mysql.com:/home/igor/mysql-4.1

Do not reset value of LAST_INSERT_ID() in sub-statement.

Fixed windows compile error in sql/sp.cc (missing cast to byte*)

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18643

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime

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

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

into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0

The bug caused wrong result sets for union constructs of the form
(SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
For such queries order lists were concatenated and limit clause was
completely neglected. 

 the innodb-5.0-ss476 snapshot.

 Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
 Also, fix memory leaks in row_create_table_for_mysql() in rare
 corner cases.

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

 Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section"
     Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS
     output.
 Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID".
     Refuse tables that use reserved column names.

Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)

into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime

into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1

  Remove duplicate test case for bug#14169

into  production.mysql.com:/usersnfs/mleich/src

  Clean up test case for bug#14169