From: Frazer Clement
Date: June 21 2011 9:44am
Subject: bzr commit into mysql-5.5-cluster branch (frazer.clement:3361)
List-Archive: http://lists.mysql.com/commits/139562
Message-Id: <201106210945.p5L9j2s7003891@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1482031141032366449=="

--===============1482031141032366449==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;


--===============1482031141032366449==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/frazer.clement@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: frazer.clement@stripped\
#   bac220wygvp0abze
# target_branch: file:///home/frazer/bzr/mysql-5.5-cluster/
# testament_sha1: 421b8e4e5c1484d26fb4d2faeca3f1573e0628d7
# timestamp: 2011-06-21 10:44:59 +0100
# source_branch: file:///home/frazer/bzr/mysql-5.1-telco-7.1/
# base_revision_id: frazer.clement@stripped\
#   pusjor2rz119rx25
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWakRZ4YAAipfgAAwVOf/939D
lOC////wUATY3umpTnF3czTyAJKJpqn6jJPIjZBGZJpiMjQAaYjTQJSamjAmQap6U9J6agwj1ABo
BoADEphARqY0mmIyAAGaQ0aaaADJIj0J6jQGgDQaAA0AABoJJAmpiaNGQmU8EzUmAgAGQGm02kXw
MACyU6UA1jbHCXHi3zDExvFMVdJNMjQoCEhqe/HurXuroNINODVlRKRjrFKImfFV5gWqgXPvs8Zv
NTwcylUHNgezStRQcPgc5EgGmuCvusAkcC2fCdv0/t7nBDagYRF3vUV4X/ODR8xMLiH5tF+1oZch
WF3hxUhNfgjIJhOBkuItr9H0Zut+bEtth+fyIq35xNno3Xw6TE8epGQwOwpEaRI1SCphYeRIV5l1
VPTFS1OST9TAQDOOwJDhEBxg8T1mTleLzg9UirEUDeNouPguqsKQpSKRaDn2PIpHRL0DB27CHXdk
T0jYc5Oo5pVrtohiJDXlyaK441Eprv03ZmepbGVQtm/1EgZIvE4TLuFAjQOKyXoDCH/282T/WWyD
oQLwcl8xgp0al3O0VI2cP1gaOejSfMDUYGvDVyRzsI8qI542/jUcVGTwaqUiUxYzbfItaNxQKqva
FlNCxrI17A5hPqMgxSwhgWV7aY4E5hcQkxImcqMrbJCTZI8dfzingOrvmkEZRjBikIrKsbZEKGec
hFlDLVslmXGhiPKB7BJJBCkqEgeq5aiLGjIwT0VBOEQIRWi8uWibouCRcmrqiSNo9gIzoILp2KpJ
IfADnguA7HnWETavQ7ijOXwRH6cn0WCIidvXgqLkyKzKMZ66GkZTWODKZsfZVBLKKyKbvSNEs9+c
UYa+aTcJ3Etyop4IaiijyjURonE10tyUFqu2oHac9+VHiKm9ZJrKUGCyJDBa9TreDINGXS50zIkW
kivgYkTsSHkWTAoRuTVwgd55aF4isUESM5LYSp9+YhxOSUYCebCCE7y1fDeOHcyw97cEHdG6fYLP
AOmgniM35V7cemrId6hwZb7qVzBKakGJDP5MStYWJFLHl7ULiqOixJ7IgJvFrkTFUS2PqwleIyFe
fG4iRjLZ1cOucyCYsyNhpGNfpGxiehTiGNPmLsW8JUPuMYjoMMWDVOR38U0uZpVDzGjcFVKMguV1
sZhFgZdQcDQ2OFrBUXFmYH+R7i8HA9Q7E8onFkkQU9yog3FDhrmTl1vYCTlvR0GqxI0RM5dOVEjm
NLhROZczgaYmAk7EKAaD2V0zFFIZmoN1iOkpcLcxiEE2VblfrFGGfWwKQHMoiUSFoZAPxIhAbNpR
osXCDWmh8v10QoQ2ItjzpWym47ABcDC4MLxjmKISw0okNFAgEalEmKSAk3msUsSOAWxt5vIyldWo
IyiqNfT8pzkIdoG3FQvukyqBmr8AZzHMHYzoFwLZ8JXWMWTyA3IH7grXdV3+vknimMBRUDps6wsD
KfUW1Ha/KLcKTwWBelGDXjhQnkslUKrENPToyFJbFwYgsCQydXG/sGwI8GowsgLJHeECS0hQLt6z
rgXU+IswVmaQPGYwFqpTwzF3WibOBOn/xdyRThQkKkRZ4YA=


--===============1482031141032366449==--