Merge mysql.com:/home/mydev/mysql-5.1

into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg


mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/rpl_foreign_key_innodb.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge

2 files changed, 25 insertions, 30 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index b40a40684fe..33fc977a5de 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1857,12 +1857,7 @@ void handler::print_error(int error, myf errflag)
 	str.length(max_length-4);
 	str.append(STRING_WITH_LEN("..."));
       }
-#ifdef XXX_TO_BE_DONE_BY_A_FOLLOWUP_OF_WL1563
-      my_printf_error(ER_DUP_ENTRY, "Duplicate entry '%s' for key '%s'",
-                      MYF(0), str.c_ptr(), table->key_info[key_nr].name);
-#else
-      my_error(ER_DUP_ENTRY, MYF(0), str.c_ptr(), key_nr+1);
-#endif
+      my_error(ER_DUP_ENTRY, MYF(0), str.c_ptr(), table->key_info[key_nr].name);
       DBUG_VOID_RETURN;
     }
     textno=ER_DUP_KEY;
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 084ab31c459..1ced1ee2db1 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 %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"
+	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_WRONG_FIELD_SPEC 42000 S1009
 	cze "Chybn-B� specifikace sloupce '%-.64s'"
 	dan "Forkert kolonnespecifikaton for felt '%-.64s'"