bk commit into 5.1 tree (tomas:1.2575)

[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, 2008-04-08 22:11:18+02:00, tomas@stripped +2 -0
  correction of manual merge

  mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2008-04-08 22:11:11+02:00, tomas@stripped +4 -4
    correction of manual merge

  mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result@stripped, 2008-04-08 22:11:11+02:00, tomas@stripped +5 -5
    correction of manual merge

diff -Nrup a/mysql-test/suite/rpl/r/rpl_heartbeat.result b/mysql-test/suite/rpl/r/rpl_heartbeat.result
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-02-20 14:10:21 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-04-08 22:11:11 +02:00
@@ -11,13 +11,13 @@ Variable_name	Slave_heartbeat_period
 Value	5.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999;
 Warnings:
-Warning	1612	The requested value for the heartbeat period  is less than 1 msec.  The period is reset to zero which means no heartbeats will be sending
+Warning	1614	The requested value for the heartbeat period  is less than 1 msec.  The period is reset to zero which means no heartbeats will be sending
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967;
 Warnings:
-Warning	1612	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
+Warning	1614	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	4294967.000
@@ -29,7 +29,7 @@ reset slave;
 set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001;
 Warnings:
-Warning	1612	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
+Warning	1614	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	5.001
@@ -41,7 +41,7 @@ Variable_name	Slave_heartbeat_period
 Value	4.000
 set @@global.slave_net_timeout= 3 /* must be a warning */;
 Warnings:
-Warning	1612	The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
+Warning	1614	The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
 reset slave;
 drop table if exists t1;
 set @@global.slave_net_timeout= 10;
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	2008-02-13 20:35:53 +01:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result	2008-04-08 22:11:11 +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	1613	Bad schema for mysql.ndb_replication table. Message: Wrong number of primary key parts, expected 3
+Error	1615	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;
 Warnings:
-Error	1614	Error in parsing conflict function. Message: NDB$X(X), unknown conflict resolution function at 'NDB$X(X)'
+Error	1616	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	1614	Error in parsing conflict function. Message: column 'X' has wrong datatype
+Error	1616	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	1614	Error in parsing conflict function. Message: NDB$MAX(), missing function argument at ')'
+Error	1616	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	1614	Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
+Error	1616	Error in parsing conflict function. Message: NDB$MAX(X Y), missing ')' at 'Y)'
 drop table t1;
 delete from mysql.ndb_replication;