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

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

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

View check option clauses were ignored for updates of multi-table
views when the updates could not be performed on fly and the rows
to update had to be put into temporary tables first.

into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

  bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
  Removed stray mthod declaration

bug#25821  Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value

with a column of the DATETIME type could return a wrong 
result set if the WHERE clause included a BETWEEN condition
on the column.
Fixed the method Item_func_between::fix_length_and_dec
where the aggregation type for BETWEEN predicates calculated
incorrectly if the first argument was a view column of the
DATETIME type.

Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

updated.

INSERT ... ON DUPLICATE KEY UPDATE reports that a record was updated when
the duplicate key occurs even if the record wasn't actually changed
because the update values are the same as those in the record.

Now the compare_record() function is used to check whether the record was
changed and the update of a record reported only if the record differs
from the original one.

 Ignoring error codes from type conversion allows default (wrong) values to
 go unnoticed in the formation of index search conditions.
 Fixed by correctly checking for conversion errors.

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

This performance degradation for UPDATEs could be observed in the update
statements for which the search key cannot be converted to any valid
value of the type of the search column, like for a  the condition
int_fld=99999999999999999999999999, though it can be guaranteed here
that there is no row with such a key value. 

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

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

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

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

added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb

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

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb

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

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

into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb

additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

Need to change directory before calling mysql-test-run.pl

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

Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt

  merge of the 5.0-opt tree

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