into  mysql.com:/home/bk/MERGE/mysql-4.1-merge

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

This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.

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

Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.

into  mysql.com:/usr/home/bar/mysql-4.1-rpl

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

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

into  chilla.local:/home/mydev/mysql-4.0-bug20719

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

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

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

Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.

If number of keys in merge table is not bigger than requested key number,
return error.

into  chilla.local:/home/mydev/mysql-4.1-bug20719-m

Deletes on a big index could crash the index when it needs to
shrink.

Put a forgotten negation operator in.

No test case. It is too big for the test suite. And it does not
work with 4.0, only with higher versions. It is attached to the
bug report.

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt

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

into  chilla.local:/home/mydev/mysql-4.0-bug20719

After merge fix.

into  chilla.local:/home/mydev/mysql-4.1-bug20719-m

into  mysql.com:/home/hf/work/mysql-4.1.15428

an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.

into  mysql.com:/home/hf/work/mysql-4.1.15428

into  mysql.com:/home/hf/work/mysql-4.1.15428

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

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty

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

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

            "concurrent insert"
After merge fix.

into  chilla.local:/home/mydev/mysql-4.0-bug14400

into  chilla.local:/home/mydev/mysql-4.0-bug14400

Any default value for a enum fields over UCS2 charsets was corrupted
when we put it into the frm file, as it had been overwritten by its
HEX representation.
To fix it now we save a copy of structure that represents the enum
type and when putting the default values we use this copy. 

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

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty