bk commit into 5.1 tree (mskold:1.2589) BUG#21072

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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-07 12:20:04+01:00, mskold@stripped +1 -0
  bug#21072 Duplicate key error in NDB references wrong key: regenerated result

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@stripped, 2007-12-07 12:19:32+01:00,
mskold@stripped +2 -2
    bug#21072 Duplicate key error in NDB references wrong key: regenerated result

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result	2007-06-27 14:27:31 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result	2007-12-07 12:19:32 +01:00
@@ -389,9 +389,9 @@ INSERT INTO t8 VALUES (99,99,99);
 INSERT INTO t8 VALUES (99,22,33);
 ERROR 23000: Duplicate entry '99' for key 'PRIMARY'
 INSERT INTO t8 VALUES (11,99,33);
-ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
+ERROR 23000: Duplicate entry '99' for key 'b'
 INSERT INTO t8 VALUES (11,22,99);
-ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
+ERROR 23000: Duplicate entry '99' for key 'c'
 SELECT * FROM t8 ORDER BY a;
 a	b	c
 99	99	99