into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats


mysql-test/t/sp.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
  Fix of merge conflict

Test fixes


mysql-test/r/binlog_stm_ctype_cp932.result:
  Fixed result file
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Fixed result file
mysql-test/t/disabled.def:
  Disabled test case
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Fix test
sql/handler.cc:
  Fix to not replicate mysql.event table

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  split pk: over-eager assert in varsize PK case

into  mysql.com:/space/pekka/ndb/version/my51

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

sql/ha_ndbcluster_binlog.cc:
  Bug #18106  	Ndb: Online add index together with replication may cause mysqld core
  - move initialization of Ndb share ndb_values from ndbcluster_binlog_open_table to
    ndbcluster_binlog_init_share so that ndbcluster_binlog_open_table can be used for reinitializing
    after frm change
  - free table share on remote mysqld on online alter (call ndbcluster_binlog_close_table)
  - free share before calling ndb_create_table_from_engine to be able to handle trailing share correctly
  + debug printouts
  + extra nulling of some variables
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Bug #18106  	Ndb: Online add index together with replication may cause mysqld core
  - reinitialize event operation rec attrs after online schema change

into  mysql.com:/space/pekka/ndb/version/my51

into  mysql.com:/space/pekka/ndb/version/my51

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into  mysql.com:/space/pekka/ndb/version/my51-dict

storage/ndb/include/ndbapi/NdbBlob.hpp:
  fast fix bug#18075
storage/ndb/include/ndbapi/NdbOperation.hpp:
  fast fix bug#18075
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlob.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/ndberror.c:
  fast fix bug#18075
storage/ndb/test/ndbapi/testBlobs.cpp:
  fast fix bug#18075

into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137

mysql-test/t/rpl_trunc_temp.test:
  Test case only works with statement logging

into  mysql.com:/usr/home/bar/mysql-5.1-new.b16318


sql/item_xmlfunc.cc:
  Auto merged
mysql-test/r/xml.result:
  After merge fix
mysql-test/t/xml.test:
  After merge fix

into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137


mysql-test/mysql-test-run.pl:
  Auto merged

into mysql.com:/home/hf/work/mysql-5.1.mrg

into  mysql.com:/users/mkindahl/bk/merge-mysql-5.1-new-wl3023

  Post-merge patches.


mysql-test/t/disabled.def:
  Disabling test that fails due to no-error patch.
sql/log_event.cc:
  Using definite constant instead of machine-dependent constant.
  Handling case where null_bytes can be zero.
sql/sql_base.cc:
  Using definite constant instead of machine-dependent constant.
sql/sql_class.cc:
  Using definite constant instead of machine-dependent constant.
sql/table.cc:
  Using definite constant instead of machine-dependent constant.

-added setting up of binlogging after receiving rename table
+cleanup


mysql-test/r/ndb_binlog_ddl_multi.result:
  Bug #17838 binlog not setup on seconday master after rename
mysql-test/t/ndb_binlog_ddl_multi.test:
  Bug #17838 binlog not setup on seconday master after rename
mysql-test/include/show_binlog_events.inc:
  New BitKeeper file ``mysql-test/include/show_binlog_events.inc''

into  mysql.com:/users/mkindahl/bk/merge-mysql-5.1-new-wl3023

Changes according to review comments.


sql/log.cc:
  Moving a comment.
sql/log_event.cc:
  Adding a note that the solution is a temporary solution.
sql/log_event.h:
  Removing dead code.
sql/sql_class.cc:
  Removing dead code. Adding a TODO comment.

Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.


mysql-test/r/rpl_ndb_blob.result:
  result change
mysql-test/t/disabled.def:
  Disabling problematic tests.
mysql-test/t/rpl_ndb_blob.test:
  Don't show binlog since it's not deterministic.
sql/log_event.cc:
  Print a warning instead of error on failure to open non-existing table.
  This is a temporary patch to prevent a bug in NDB from stopping the slave.

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

fixed test case from previous commit


mysql-test/r/ndb_lock.result:
  fixed result file form previous commit
sql/ha_ndbcluster.cc:
  cleanup of ndb invalidate dictionary cache
sql/ha_ndbcluster.h:
  cleanup of ndb invalidate dictionary cache

- only set table share version to 0 (zero) on global invalidation

into  mysql.com:/home/bk/w3023-mysql-5.1-new


mysql-test/t/sp.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/table.h:
  Auto merged

into mysql.com:/home/hf/work/mysql-5.1.mrg


sql/item_sum.cc:
  Auto merged

  Minor changes to make it work with NDB.
  


mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Not updated result file
mysql-test/r/ndb_binlog_ignore_db.result:
  Result change
mysql-test/r/rpl_ndb_blob.result:
  Result change
mysql-test/r/rpl_ndb_charset.result:
  Result change
mysql-test/r/rpl_ndb_dd_basic.result:
  Result change
sql/ha_ndbcluster_binlog.cc:
  Only calling injector::use_table() if there are data events in epoch.

into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137


sql/sql_delete.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137


sql/sql_delete.cc:
  Code has changed to use close_temporary_table which will decrease counter for open slave temp tables so the fix from previous versions can be removed.

into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574

mysql-test/t/rpl_trunc_temp.test:
  Remove final "connection master" it's already disconnected

into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137


sql/sql_delete.cc:
  Auto merged

 - Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp" 


sql/sql_delete.cc:
  Decrease "slave_open_temp_tables" after temporary table has been closed, it will be
  increased again when the temp table is reopened after it's been truncated.
mysql-test/r/rpl_trunc_temp.result:
  New BitKeeper file ``mysql-test/r/rpl_trunc_temp.result''
mysql-test/t/rpl_trunc_temp.test:
  New BitKeeper file ``mysql-test/t/rpl_trunc_temp.test''

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged