into  moonbone.local:/work/tmp_merge-5.1-mysql

into  dator5.(none):/home/pappa/push_clone

into  dator5.(none):/home/pappa/push_clone

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

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

into  dator5.(none):/home/pappa/push_clone

into  dator5.(none):/home/pappa/push_clone

fixed error message

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

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

into  dator5.(none):/home/pappa/bug21388

into  dator5.(none):/home/pappa/bug21388

Review fixes

into  moonbone.local:/work/tmp_merge-5.1-opt-mysql

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

  After merge changes

CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.

skip engine handling if engine is disabled

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

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

doesn't find the column"

When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.

The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.

The fix is to copy the pointer to the original table to the new field.

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

into  moonbone.local:/work/tmp_merge-5.1-opt-mysql

into  lamia.home:/home/timka/mysql/src/5.1-bug-21456

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591

  - BUG#15934: Instance manager fails to work;
  - BUG#18020: IM connect problem;
  - BUG#18027: IM: Server_ID differs;
  - BUG#18033: IM: Server_ID not reported;
  - BUG#21331: Instance Manager: Connect problems in tests;

The only test suite has been changed
(server codebase has not been modified).

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591

When a view was used inside a trigger or a function, lock type for
tables used in a view was always set to READ (thus making the view
non-updatable), even if we were trying to update the view.

The solution is to set lock type properly.

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

  Add order by in rpl_(ndb)_multi_update3 to make result deterministic

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

  fix backup/lcp race

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

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

  Snapup testBackup XXXerror

into  perch.ndb.mysql.com:/home/jonas/src/51-work