From 42d64e427569b962057b4db2c92327924ac18c24 Mon Sep 17 00:00:00 2001
From: "mskold/marty@mysql.com/linux.site" <>
Date: Thu, 21 Sep 2006 16:49:07 +0200
Subject: [PATCH 1/2] Bug #21072  Duplicate key error in NDB references wrong
 key: use MAX_KEY to signal unknown key

---
 mysql-test/r/ndb_charset.result      |  4 ++--
 mysql-test/r/ndb_index_unique.result | 10 +++++-----
 mysql-test/r/ndb_update.result       |  2 +-
 sql/ha_ndbcluster.cc                 |  9 ++++++++-
 sql/handler.cc                       | 20 +++++++++++++++-----
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/mysql-test/r/ndb_charset.result b/mysql-test/r/ndb_charset.result
index b8d881fca83..b014050b69f 100644
--- a/mysql-test/r/ndb_charset.result
+++ b/mysql-test/r/ndb_charset.result
@@ -78,9 +78,9 @@ unique key(a)
 ) engine=ndb;
 insert into t1 values(1, 'aAa');
 insert into t1 values(2, 'aaa');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 insert into t1 values(3, 'AAA');
-ERROR 23000: Duplicate entry '3' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 select * from t1 order by p;
 p	a
 1	aAa
diff --git a/mysql-test/r/ndb_index_unique.result b/mysql-test/r/ndb_index_unique.result
index 598b9dcccf7..f9fb6f89aa2 100644
--- a/mysql-test/r/ndb_index_unique.result
+++ b/mysql-test/r/ndb_index_unique.result
@@ -22,7 +22,7 @@ select * from t1 where b = 4 order by a;
 a	b	c
 3	4	6
 insert into t1 values(8, 2, 3);
-ERROR 23000: Duplicate entry '8' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 select * from t1 order by a;
 a	b	c
 1	2	3
@@ -89,7 +89,7 @@ a	b	c
 1	1	1
 4	4	NULL
 insert into t1 values(5,1,1);
-ERROR 23000: Duplicate entry '5' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 drop table t1;
 CREATE TABLE t2 (
 a int unsigned NOT NULL PRIMARY KEY,
@@ -112,7 +112,7 @@ select * from t2 where b = 4 order by a;
 a	b	c
 3	4	6
 insert into t2 values(8, 2, 3);
-ERROR 23000: Duplicate entry '8' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 select * from t2 order by a;
 a	b	c
 1	2	3
@@ -177,7 +177,7 @@ pk	a
 3	NULL
 4	4
 insert into t1 values (5,0);
-ERROR 23000: Duplicate entry '5' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 select * from t1 order by pk;
 pk	a
 -1	NULL
@@ -210,7 +210,7 @@ pk	a	b	c
 0	NULL	18	NULL
 1	3	19	abc
 insert into t2 values(2,3,19,'abc');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 select * from t2 order by pk;
 pk	a	b	c
 -1	1	17	NULL
diff --git a/mysql-test/r/ndb_update.result b/mysql-test/r/ndb_update.result
index c2247564e65..164d1bd700c 100644
--- a/mysql-test/r/ndb_update.result
+++ b/mysql-test/r/ndb_update.result
@@ -18,7 +18,7 @@ pk1	b	c
 2	2	2
 4	1	1
 UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
-ERROR 23000: Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '' for key 0
 select * from t1 order by pk1;
 pk1	b	c
 0	0	0
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 7398c15a9c8..240030a5a5f 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -454,7 +454,14 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans)
   if (res == HA_ERR_FOUND_DUPP_KEY)
   {
     if (m_rows_to_insert == 1)
-      m_dupkey= table->primary_key;
+    {
+      /*
+	We can only distinguish between primary and non-primary
+	violations here, so we need to return MAX_KEY for non-primary
+	to signal that key is unknown
+      */
+      m_dupkey= err.code == 630 ? table->primary_key : MAX_KEY; 
+    }
     else
     {
       /* We are batching inserts, offending key is not available */
diff --git a/sql/handler.cc b/sql/handler.cc
index c05fc8ba0e7..be8d2e2aed3 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1102,12 +1102,22 @@ void handler::print_error(int error, myf errflag)
       /* Write the dupplicated key in the error message */
       char key[MAX_KEY_LENGTH];
       String str(key,sizeof(key),system_charset_info);
-      key_unpack(&str,table,(uint) key_nr);
-      uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY));
-      if (str.length() >= max_length)
+
+      if (key_nr == MAX_KEY)
       {
-	str.length(max_length-4);
-	str.append("...");
+	/* Key is unknown */
+	str.length(0);
+	key_nr= -1;
+      }
+      else
+      {
+	key_unpack(&str,table,(uint) key_nr);
+	uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY));
+	if (str.length() >= max_length)
+	  {
+	    str.length(max_length-4);
+	    str.append("...");
+	  }
       }
       my_error(ER_DUP_ENTRY,MYF(0),str.c_ptr(),key_nr+1);
       DBUG_VOID_RETURN;

From c854ecebf9efde74535f7756678f02d7beb95449 Mon Sep 17 00:00:00 2001
From: "mskold/marty@mysql.com/linux.site" <>
Date: Thu, 21 Sep 2006 16:54:54 +0200
Subject: [PATCH 2/2] Bug #21072  Duplicate key error in NDB references wrong
 key: wrong indent for code block

---
 sql/handler.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index be8d2e2aed3..40f2af75c2f 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1114,10 +1114,10 @@ void handler::print_error(int error, myf errflag)
 	key_unpack(&str,table,(uint) key_nr);
 	uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY));
 	if (str.length() >= max_length)
-	  {
+	{
 	    str.length(max_length-4);
 	    str.append("...");
-	  }
+	}
       }
       my_error(ER_DUP_ENTRY,MYF(0),str.c_ptr(),key_nr+1);
       DBUG_VOID_RETURN;