into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-bug30491

1. A bad error message was given when a MERGE table with an
   InnoDB child table was tried to use.

2. After selecting from a correct MERGE table and then altering
   one of the children to InnoDB, incorrect results were returned.

These bugs have been fixed with the patch for bug 26379 (Combination
of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table).

For verification, I added the test case from the bug report.

Reverted log tables alteration.

into  mysql.com:/home/ram/work/b29258/b29258.5.1

into  april.(none):/home/svoj/devel/mysql/BUG32050/mysql-5.1-engines

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg

  - result adjusted.

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

into  mysql.com:/home/ram/work/b32726/b32726.5.0

into  mysql.com:/home/ram/work/b32726/b32726.5.1

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  mysql.com:/home/ram/work/b32559/b32559.5.0

into  mysql.com:/home/ram/work/b32559/b32559.5.1

into  mysql.com:/home/ram/work/b32676/b32676.5.1

into  mysql.com:/home/ram/work/b32676/b32676.5.0

into  stella.local:/home2/mydev/mysql-5.1-axmrg

Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.

into  mysql.com:/home/ram/work/b32676/b32676.5.1

Disabled test case.

  - fix for #31070 (missed during merging) applied for cp932 charset.
  - tests/results adjusted.

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

Disabled the test case.

into  mysql.com:/home/ram/work/b30495/b30495.5.0

into  mysql.com:/home/ram/work/b30495/b30495.5.1

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  mysql.com:/home/ram/work/b30495/b30495.5.0

INSERT/UPDATE against CSV table created by MySQL earlier than 5.1.23
with NULL-able column results in server crash in debug builds.

Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
but it is still possible to get such table from older MySQL versions.

Fixed by removing excessive DBUG_ASSERT().

  - archive test/result adjusted.
  - OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.

Some test cases were missing preparation to deal with failed
predecessor test cases.

Added preparation (drop table if exists) to some test cases.

into  mysql.com:/home/ram/work/b30495/b30495.5.1

Problem: passing a non-constant name to the NAME_CONST function results in a crash.

Fix: check the NAME_CONST name argument; return fake item type if we got
non-constant argument(s).