bk commit into 5.1 tree (tomas:1.2792)

[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-12-13 21:44:29+01:00, tomas@stripped +2 -0
  minor fixes

  mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result@stripped, 2007-12-13 21:44:26+01:00,
tomas@stripped +1 -1
    correct result file

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-12-13 21:44:26+01:00,
tomas@stripped +1 -1
    correct error message

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-12-11 08:52:51 +01:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result	2007-12-13 21:44:26 +01:00
@@ -6,7 +6,7 @@ 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	1610	Bad schema for mysql.ndb_replication table. Message: Missing or wrong type for
column 'server_id'
+Error	1610	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;
diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-12-13 14:30:14 +01:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-12-13 21:44:26 +01:00
@@ -3097,7 +3097,7 @@ ndbcluster_read_binlog_replication(THD *
   if (reptab->getNoOfPrimaryKeys() != 3)
   {
     error= -2;
-    error_str= "Wrong number of primary keys, expected 3";
+    error_str= "Wrong number of primary key parts, expected 3";
     goto err;
   }
   error= -1;