Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged

3 files changed, 53 insertions, 28 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 360d528f0ad..c596556fc98 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2041,7 +2041,7 @@ void handler::print_keydup_error(uint key_nr, const char *msg)
   {
     /* Key is unknown */
     str.copy("", 0, system_charset_info);
-    my_printf_error(ER_DUP_ENTRY, msg,
+    my_printf_error(ER_DUP_ENTRY_WITH_KEY_NAME, msg,
 		    MYF(0), str.c_ptr(), "*UNKNOWN*");
   }
   else
@@ -2054,7 +2054,7 @@ void handler::print_keydup_error(uint key_nr, const char *msg)
       str.length(max_length-4);
       str.append(STRING_WITH_LEN("..."));
     }
-    my_printf_error(ER_DUP_ENTRY, msg,
+    my_printf_error(ER_DUP_ENTRY_WITH_KEY_NAME, msg,
 		    MYF(0), str.c_ptr(), table->key_info[key_nr].name);
   }
 }
@@ -2099,7 +2099,7 @@ void handler::print_error(int error, myf errflag)
     uint key_nr=get_dup_key(error);
     if ((int) key_nr >= 0)
     {
-      print_keydup_error(key_nr, ER(ER_DUP_ENTRY));
+      print_keydup_error(key_nr, ER(ER_DUP_ENTRY_WITH_KEY_NAME));
       DBUG_VOID_RETURN;
     }
     textno=ER_DUP_KEY;
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 15ea8f67c0d..29fde49bbd6 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -1479,30 +1479,30 @@ ER_DUP_KEYNAME 42000 S1009
         swe "Nyckelnamn '%-.64s' finns flera g�nger"
         ukr "�������� ��'� ����� '%-.64s'"
 ER_DUP_ENTRY 23000 S1009
-        cze "Zvojen-B� kl�� '%-.64s' (��slo kl��e '%-.64s')"
-        dan "Ens v�rdier '%-.64s' for indeks '%-.64s'"
-        nla "Dubbele ingang '%-.64s' voor zoeksleutel '%-.64s'"
-        eng "Duplicate entry '%-.64s' for key '%-.64s'"
-        jps "'%-.64s' �� key '%-.64s' �ɂ����ďd�����Ă��܂�",
-        est "Kattuv v��rtus '%-.64s' v�tmele '%-.64s'"
-        fre "Duplicata du champ '%-.64s' pour la clef '%-.64s'"
-        ger "Doppelter Eintrag '%-.64s' f�r Schl�ssel '%-.64s'"
-        greek "����� ������� '%-.64s' ��� �� ������ '%-.64s'"
-        hun "Duplikalt bejegyzes '%-.64s' a '%-.64s' kulcs szerint."
-        ita "Valore duplicato '%-.64s' per la chiave '%-.64s'"
-        jpn "'%-.64s' �� key '%-.64s' �ˤ����ƽ�ʣ���Ƥ��ޤ�"
-        kor "�ߺ��� �Է� �� '%-.64s': key '%-.64s'"
-        nor "Like verdier '%-.64s' for n�kkel '%-.64s'"
-        norwegian-ny "Like verdiar '%-.64s' for nykkel '%-.64s'"
-        pol "Powt�rzone wyst?pienie '%-.64s' dla klucza '%-.64s'"
-        por "Entrada '%-.64s' duplicada para a chave '%-.64s'"
-        rum "Cimpul '%-.64s' e duplicat pentru cheia '%-.64s'"
-        rus "������������� ������ '%-.64s' �� ����� '%-.64s'"
-        serbian "Dupliran unos '%-.64s' za klju� '%-.64s'"
-        slo "Opakovan� k��� '%-.64s' (��slo k���a '%-.64s')"
-        spa "Entrada duplicada '%-.64s' para la clave '%-.64s'"
-        swe "Dubbel nyckel '%-.64s' f�r nyckel '%-.64s'"
-        ukr "��������� ����� '%-.64s' ��� ����� '%-.64s'"
+	cze "Zvojen-B� kl�� '%-.64s' (��slo kl��e %d)"
+	dan "Ens v�rdier '%-.64s' for indeks %d"
+	nla "Dubbele ingang '%-.64s' voor zoeksleutel %d"
+	eng "Duplicate entry '%-.64s' for key %d"
+	jps "'%-.64s' �� key %d �ɂ����ďd�����Ă��܂�",
+	est "Kattuv v��rtus '%-.64s' v�tmele %d"
+	fre "Duplicata du champ '%-.64s' pour la clef %d"
+	ger "Doppelter Eintrag '%-.64s' f�r Schl�ssel %d"
+	greek "����� ������� '%-.64s' ��� �� ������ %d"
+	hun "Duplikalt bejegyzes '%-.64s' a %d kulcs szerint."
+	ita "Valore duplicato '%-.64s' per la chiave %d"
+	jpn "'%-.64s' �� key %d �ˤ����ƽ�ʣ���Ƥ��ޤ�"
+	kor "�ߺ��� �Է� �� '%-.64s': key %d"
+	nor "Like verdier '%-.64s' for n�kkel %d"
+	norwegian-ny "Like verdiar '%-.64s' for nykkel %d"
+	pol "Powt�rzone wyst?pienie '%-.64s' dla klucza %d"
+	por "Entrada '%-.64s' duplicada para a chave %d"
+	rum "Cimpul '%-.64s' e duplicat pentru cheia %d"
+	rus "������������� ������ '%-.64s' �� ����� %d"
+	serbian "Dupliran unos '%-.64s' za klju� '%d'"
+	slo "Opakovan� k��� '%-.64s' (��slo k���a %d)"
+	spa "Entrada duplicada '%-.64s' para la clave %d"
+	swe "Dubbel nyckel '%-.64s' f�r nyckel %d"
+	ukr "��������� ����� '%-.64s' ��� ����� %d"
 ER_WRONG_FIELD_SPEC 42000 S1009
         cze "Chybn-B� specifikace sloupce '%-.64s'"
         dan "Forkert kolonnespecifikaton for felt '%-.64s'"
@@ -6025,6 +6025,31 @@ ER_WRONG_PARAMETERS_TO_STORED_FCT 42000
 ER_NATIVE_FCT_NAME_COLLISION
         eng "This function '%-.64s' has the same name as a native function"
         ger "Die Funktion '%-.64s' hat denselben Namen wie eine native Funktion"
+ER_DUP_ENTRY_WITH_KEY_NAME 23000 S1009
+        cze "Zvojen-B� kl�� '%-.64s' (��slo kl��e '%-.64s')"
+        dan "Ens v�rdier '%-.64s' for indeks '%-.64s'"
+        nla "Dubbele ingang '%-.64s' voor zoeksleutel '%-.64s'"
+        eng "Duplicate entry '%-.64s' for key '%-.64s'"
+        jps "'%-.64s' �� key '%-.64s' �ɂ����ďd�����Ă��܂�",
+        est "Kattuv v��rtus '%-.64s' v�tmele '%-.64s'"
+        fre "Duplicata du champ '%-.64s' pour la clef '%-.64s'"
+        ger "Doppelter Eintrag '%-.64s' f�r Schl�ssel '%-.64s'"
+        greek "����� ������� '%-.64s' ��� �� ������ '%-.64s'"
+        hun "Duplikalt bejegyzes '%-.64s' a '%-.64s' kulcs szerint."
+        ita "Valore duplicato '%-.64s' per la chiave '%-.64s'"
+        jpn "'%-.64s' �� key '%-.64s' �ˤ����ƽ�ʣ���Ƥ��ޤ�"
+        kor "�ߺ��� �Է� �� '%-.64s': key '%-.64s'"
+        nor "Like verdier '%-.64s' for n�kkel '%-.64s'"
+        norwegian-ny "Like verdiar '%-.64s' for nykkel '%-.64s'"
+        pol "Powt�rzone wyst?pienie '%-.64s' dla klucza '%-.64s'"
+        por "Entrada '%-.64s' duplicada para a chave '%-.64s'"
+        rum "Cimpul '%-.64s' e duplicat pentru cheia '%-.64s'"
+        rus "������������� ������ '%-.64s' �� ����� '%-.64s'"
+        serbian "Dupliran unos '%-.64s' za klju� '%-.64s'"
+        slo "Opakovan� k��� '%-.64s' (��slo k���a '%-.64s')"
+        spa "Entrada duplicada '%-.64s' para la clave '%-.64s'"
+        swe "Dubbel nyckel '%-.64s' f�r nyckel '%-.64s'"
+        ukr "��������� ����� '%-.64s' ��� ����� '%-.64s'"
 ER_BINLOG_PURGE_EMFILE
         eng "Too many files opened, please execute the command again"
         ger "Zu viele offene Dateien, bitte f�hren Sie den Befehl noch einmal aus"
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 35a5547a730..c2be1b55b7f 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -6820,7 +6820,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
            uint key_nr= to->file->get_dup_key(error);
            if ((int) key_nr >= 0)
            {
-             const char *err_msg= ER(ER_DUP_ENTRY);
+             const char *err_msg= ER(ER_DUP_ENTRY_WITH_KEY_NAME);
              if (key_nr == 0 &&
                  (to->key_info[0].key_part[0].field->flags &
                   AUTO_INCREMENT_FLAG))