bk commit into 5.1 tree (mskold:1.2315) 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, 2006-10-16 14:20:05+02:00, mskold@stripped +1 -0
   Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for
duplicate key error when key is unknown

  mysql-test/r/rpl_row_basic_7ndb.result@stripped, 2006-10-16 14:19:43+02:00, mskold@stripped
+2 -2
     Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for
duplicate key error when key is unknown

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1

--- 1.3/mysql-test/r/rpl_row_basic_7ndb.result	2006-10-16 14:20:14 +02:00
+++ 1.4/mysql-test/r/rpl_row_basic_7ndb.result	2006-10-16 14:20:14 +02: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 '11' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 INSERT INTO t8 VALUES (11,22,99);
-ERROR 23000: Duplicate entry '11' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 SELECT * FROM t8 ORDER BY a;
 a	b	c
 99	99	99