bzr push into mysql-5.5-cluster branch (frazer.clement:3360 to 3361)

[Frazer Clement]

 3361 Frazer Clement	2011-06-21
      Testcase fix

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result
 3360 Frazer Clement	2011-06-20 [merge]
      Merge mysql-5.1-telco-7.1 -> mysql-5.5-cluster

    added:
      mysql-test/suite/ndb_rpl/ndb_master-slave_2ch_end.inc
    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result
      mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc
      mysql-test/suite/ndb_rpl/t/ndb_conflict_info_init.inc
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/ndb_share.h
      sql/ndb_thd_ndb.h
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
      storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/test/include/HugoQueryBuilder.hpp
      storage/ndb/test/src/HugoQueryBuilder.cpp
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result	2011-06-20 10:41:04 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result	2011-06-21 09:44:52 +0000
@@ -2,35 +2,35 @@ include/master-slave.inc
 [connection master]
 create table t1 (a int key, X int) engine ndb;
 Warnings:
-Error	1626	Bad schema for mysql.ndb_replication table. Message: Wrong number of primary key parts, expected 3
+Warning	1625	Bad schema for mysql.ndb_replication table. Message: Wrong number of primary key parts, expected 3
 drop table t1;
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$X(X)");
 create table t1 (a int key, X int) engine ndb;
-ERROR HY000: Can't create table 'test.t1' (errno: 1627)
+ERROR HY000: Can't create table 'test.t1' (errno: 1626)
 show warnings;
 Level	Code	Message
-Error	1627	Error in parsing conflict function. Message: NDB$X(X), unknown conflict resolution function at 'NDB$X(X)'
-Error	1005	Can't create table 'test.t1' (errno: 1627)
+Warning	1626	Error in parsing conflict function. Message: NDB$X(X), unknown conflict resolution function at 'NDB$X(X)'
+Error	1005	Can't create table 'test.t1' (errno: 1626)
 delete from mysql.ndb_replication;
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX(X)");
 create table t1 (a int key, X int) engine ndb;
 Warnings:
-Error	1627	Error in parsing conflict function. Message: column 'X' has wrong datatype
+Warning	1626	Error in parsing conflict function. Message: column 'X' has wrong datatype
 drop table t1;
 delete from mysql.ndb_replication;
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX()");
 create table t1 (a int key, X int) engine ndb;
-ERROR HY000: Can't create table 'test.t1' (errno: 1627)
+ERROR HY000: Can't create table 'test.t1' (errno: 1626)
 show warnings;
 Level	Code	Message
-Error	1627	Error in parsing conflict function. Message: NDB$MAX(), missing function argument at ')'
-Error	1005	Can't create table 'test.t1' (errno: 1627)
+Warning	1626	Error in parsing conflict function. Message: NDB$MAX(), missing function argument at ')'
+Error	1005	Can't create table 'test.t1' (errno: 1626)
 delete from mysql.ndb_replication;
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX(X Y)");
 create table t1 (a int key, X int) engine ndb;
-ERROR HY000: Can't create table 'test.t1' (errno: 1627)
+ERROR HY000: Can't create table 'test.t1' (errno: 1626)
 show warnings;
 Level	Code	Message
-Error	1627	Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
-Error	1005	Can't create table 'test.t1' (errno: 1627)
+Warning	1626	Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
+Error	1005	Can't create table 'test.t1' (errno: 1626)
 delete from mysql.ndb_replication;

No bundle (reason: useless for push emails).