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

Fixed a compiler warning, deteced by pushbuild only.

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

After backport fix.
Added forgotten DBUG_RETURNs, which was detected in 5.1 only.

After merge fix

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

          incorrect key file for table

In certain cases it could happen that deleting a row could
corrupt an RTREE index.

According to Guttman's algorithm, page underflow is handled
by storing the page in a list for later re-insertion. The
keys from the stored pages have to be inserted into the
remaining pages of the same level of the tree. Hence the
level number is stored in the re-insertion list together
with the page.

In the MySQL RTree implementation the level counts from zero
at the root page, increasing numbers for levels down the tree.

If during re-insertion of the keys the tree height grows, all
level numbers become invalid. The remaining keys will be
inserted at the wrong level.

The fix is to increment the level numbers stored in the
reinsert list after a split of the root block during reinsertion.

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

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

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt

Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.

into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

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

into  mysql.com:/home/hf/work/25492/my50-25492

into  mysql.com:/home/hf/work/25492/my50-25492

into  mysql.com:/home/hf/work/25492/my41-25492

into  mysql.com:/home/hf/work/25492/my50-25492

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

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

 Common symbols with and without initialization
 cause the apple linker to exclude then from the
 list of global symbols.

into  mysql.com:/home/tnurnberg/24660/50-24660

into  mysql.com:/home/tnurnberg/24660/41-24660

into  mysql.com:/home/tnurnberg/24660/50-24660

ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used. Now if 0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.

The crash happens because second filling of the same I_S table happens in
case of subselect with order by. table->sort.io_cache previously allocated
in create_sort_index() is deleted during second filling
(function get_schema_tables_result). There are two places where
I_S table can be filled: JOIN::exec and create_sort_index().
To fix the bug we should check if the table was already filled
in one of these places and skip processing of the table in second.

Some fields (GEOMETRY first of all) can't be handled properly in this
case at all. So we return an error in this case

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

The function make_unireg_sortorder ignored the fact that any
view field is represented by a 'ref' object.
This could lead to wrong results for the queries containing
both GROUP BY and ORDER BY clauses.

  Post fix for bug#12122.
information_schema.result:
  Corrected test case after fixing bug#12122.

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