into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines

            differences in tables
Certain merge tables were wrongly reported as having incorrect definition:
- Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
  be internally casted (in certain cases) to a different type on a
  storage engine layer. (affects 4.1 and up)
- If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
  than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
  identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
  sync. (affects 4.1 only)

This is fixed by relaxing a check for underlying conformance and setting
field type to FIELD_TYPE_STRING in case varchar is shorter than 4
when a table is created.

into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

  Restored accidently removed line to check for zlib

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

  Removed references to my_winsem.c

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

  Removed references to unused files

into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build

  Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h

into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql

When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.

Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql

into  chilla.local:/home/mydev/mysql-4.1-bug25673

into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.0-bug25673

Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.

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

When doing partial blob update with NdbBlob::writeData(), zero-padding
after the write was wrongly done, causing part of the old blob value
to be overwritten with zeros (or spaces for text field).

Fixed by only padding when needed (when writing at end of the blob).

into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build

away.

Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.

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

Fixed a compiler warning, deteced by pushbuild only.

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

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

added error code for failing send signal and timeout waiting for node failure

into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt

 Fixed boundry checks in the INSERT() function:
 were one off.

into  olga.mysql.com:/home/igor/mysql-5.0-opt

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

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661

construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the 
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.