into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

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

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

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

The problem was in dummy grep on AIX and HPUX.

The fix is to use more portable patterns.

The patch is only for test suite
(i.e. does not touch server codebase).

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