bk commit into 5.1 tree (tomas:1.2646)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-14 17:15:38+02:00, tomas@stripped +1 -0
  error numners shifted

  mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result@stripped, 2007-10-14 17:15:35+02:00, tomas@stripped +5 -5
    error numners shifted

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result	2007-09-07 06:43:11 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result	2007-10-14 17:15:35 +02:00
@@ -6,29 +6,29 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 create table t1 (a int key, X int) engine ndb;
 Warnings:
-Error	1604	Bad schema for mysql.ndb_replication table. Message: Missing or wrong type for column 'server_id'
+Error	1606	Bad schema for mysql.ndb_replication table. Message: Missing or wrong type for column 'server_id'
 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;
 Warnings:
-Error	1605	Error in parsing conflict function. Message: NDB$X(X), unknown conflict resolution function at 'NDB$X(X)'
+Error	1607	Error in parsing conflict function. Message: NDB$X(X), unknown conflict resolution function at 'NDB$X(X)'
 drop table t1;
 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	1605	Error in parsing conflict function. Message: column 'X' has wrong datatype
+Error	1607	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;
 Warnings:
-Error	1605	Error in parsing conflict function. Message: NDB$MAX(), missing function argument at ')'
+Error	1607	Error in parsing conflict function. Message: NDB$MAX(), missing function argument at ')'
 drop table t1;
 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;
 Warnings:
-Error	1605	Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
+Error	1607	Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
 drop table t1;
 delete from mysql.ndb_replication;