bzr commit into mysql-5.5-cluster branch (frazer.clement:3434)

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.5-cluster/ based on revid:frazer.clement@stripped

 3434 Frazer Clement	2011-07-11
      Re-enable new test ndb_rpl_conflict_epoch

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result
      mysql-test/suite/ndb_rpl/t/disabled.def
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result	2011-07-07 14:48:06 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result	2011-07-11 11:09:58 +0000
@@ -2857,17 +2857,17 @@ insert into mysql.ndb_replication values
 ("test", "t3", 0, 7, "NDB\$EPOCH(32)"),
 ("test", "t4", 0, 7, "NDB\$EPOCH(-1)");
 create table test.t3 (a int primary key) engine=ndb;
-ERROR HY000: Can't create table 'test.t3' (errno: 1627)
+ERROR HY000: Can't create table 'test.t3' (errno: 1626)
 show warnings;
 Level	Code	Message
-Error	1627	Error in parsing conflict function. Message: NDB$EPOCH(32), Too many extra Gci bits at ')'
-Error	1005	Can't create table 'test.t3' (errno: 1627)
+Warning	1626	Error in parsing conflict function. Message: NDB$EPOCH(32), Too many extra Gci bits at ')'
+Error	1005	Can't create table 'test.t3' (errno: 1626)
 create table test.t4 (a int primary key) engine=ndb;
-ERROR HY000: Can't create table 'test.t4' (errno: 1627)
+ERROR HY000: Can't create table 'test.t4' (errno: 1626)
 show warnings;
 Level	Code	Message
-Error	1627	Error in parsing conflict function. Message: NDB$EPOCH(-1), Too many extra Gci bits at ')'
-Error	1005	Can't create table 'test.t4' (errno: 1627)
+Warning	1626	Error in parsing conflict function. Message: NDB$EPOCH(-1), Too many extra Gci bits at ')'
+Error	1005	Can't create table 'test.t4' (errno: 1626)
 -- Force sync before dropping table to avoid race
 flush logs;
 flush logs;
@@ -2875,5 +2875,4 @@ drop table mysql.ndb_replication;
 -- Attempt to get system back in pre-test state
 stop slave;
 reset slave;
-change master to master_host='';
 include/rpl_end.inc

=== modified file 'mysql-test/suite/ndb_rpl/t/disabled.def'
--- a/mysql-test/suite/ndb_rpl/t/disabled.def	2011-07-08 15:05:28 +0000
+++ b/mysql-test/suite/ndb_rpl/t/disabled.def	2011-07-11 11:09:58 +0000
@@ -15,4 +15,3 @@ ndb_rpl_ctype_ucs2_def : bug #34661 rpl_
 ndb_rpl_slave_lsu : SEAGULL ndb-force-binlog-format-statement
 ndb_rpl_slave_lsu_anyval : SEAGULL ndb-force-binlog-format-statement
 ndb_rpl_row_implicit_commit_binlog : SEAGULL ndb-force-binlog-format-statement
-ndb_rpl_conflict_epoch : needs new replication setup....

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test	2011-07-07 14:48:06 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.test	2011-07-11 11:09:58 +0000
@@ -256,6 +256,5 @@ drop table mysql.ndb_replication;
 --connection master
 stop slave;
 reset slave;
-change master to master_host='';
 
 --source include/rpl_end.inc


Attachment: [text/bzr-bundle] bzr/[e-mail]