into  mysql.com:/home/gluh/MySQL/Merge/5.1

into  mysql.com:/home/gluh/MySQL/Merge/5.0

A better fix for bug#10025.

Fixed test case plus added new tests.

After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.

Type longtext still converts correctly to type longtext, as the extra
tests prove.

into  trift2.:/MySQL/M50/push-5.0

into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)

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

  Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)

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

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1

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

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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

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

into  trift2.:/MySQL/M51/push-5.1

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

local file slipped into a previous commit, fixing ignore.

into  trift2.:/MySQL/M50/push-5.0

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl

Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().

into  chilla.local:/home/mydev/mysql-5.0-toteam