List:Commits« Previous MessageNext Message »
From:Frazer Clement Date:June 21 2011 9:44am
Subject:bzr commit into mysql-5.5-cluster branch (frazer.clement:3361)
View as plain text  
#At file:///home/frazer/bzr/mysql-5.5-cluster/ based on revid:frazer.clement@stripped

 3361 Frazer Clement	2011-06-21
      Testcase fix

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result
=== 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;


Attachment: [text/bzr-bundle] bzr/frazer.clement@oracle.com-20110621094452-bac220wygvp0abze.bundle
Thread
bzr commit into mysql-5.5-cluster branch (frazer.clement:3361) Frazer Clement21 Jun