into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25460

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

into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25460

The previous two patches for this bug worked together so that
no permanent table was memory mapped. The first patch tried to
avoid mapping while a table is in use. It allowed mapping only
if there was exactly one lock on the table, assuming that the
calling thread owned it. During mi_open(), a different call to
memory mapping was coded, which did not have this limitation.

The second patch tried to remove the code duplication and just
called mi_extra() from mi_open() an thus inherited the limitation.
But on open, a thread does not have a lock on the table...

A possible solution would be to check for zero or one lock.
But since I learned that it is safe to memory map a file while
normal file I/O is done on it, I removed the restriction altogether
and allow to memory map while a table is in use.

No test case. I do not see a chance to verify with the test suite
which kind of I/O is used on a table.

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

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.1-engines

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

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  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt

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.

away.

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

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

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

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

Fixed a compiler warning, deteced by pushbuild only.

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

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

into  mysql.com:/home/hf/work/mrg/mysql-5.1-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  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

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.

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

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