into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

- adoptions to handle binlog

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  Fix for failure in aix52 failure during push build

  corrected merge

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

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

- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd

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

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  mysql.com:/home/mysql-5.1-18997e

if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.

into  mysql.com:/data0/mysqldev/my/mysql-5.1-new

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509

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

The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.

This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.

Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.

into  mysql.com:/usr/local/mysql/tmp-5.1

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss547
 Null merge

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work
 Null merge

- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid

 Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter".

 Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
 

  
Stored procedure execution sometimes placed the address of auto variables
in the list of Item changes to undo in THD::rollback_item_tree_changes().
This could cause stack corruption.

Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

  Added suppressions for Red Hat AS 4

into  mysql.com:/home/psergey/mysql-5.1-merge2