Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/pem/work/mysql-4.1

sql/share/czech/errmsg.txt

@@ -264,3 +264,4 @@ v/*
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/danish/errmsg.txt

@@ -258,3 +258,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/dutch/errmsg.txt

@@ -266,3 +266,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/estonian/errmsg.txt

@@ -260,3 +260,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/french/errmsg.txt

@@ -255,3 +255,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/german/errmsg.txt

@@ -228,7 +228,6 @@
 "Foreign_Key Beschränkung konnte nicht hinzugefügt werden.",
 "Hinzufügen eines Kind-Datensatzes schlug aufgrund einer Foreign-Key Beschränkung fehl.",
 "Löschen eines Eltern-Datensatzes schlug aufgrund einer Foreign-Key Beschränkung fehl.",
-"Datensatz kann aufgrund einer Foreign-Key Beschränkung nicht gelöscht werden.",
 "Fehler bei der Verbindung zum Master: %-.128s",
 "Beim Ausführen einer Abfrage auf dem Master trat ein Fehler auf: %-.128s.",
 "Fehler beim Ausführen des Befehls %s: %-.128s.",
@@ -265,3 +264,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/greek/errmsg.txt

@@ -255,3 +255,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/hungarian/errmsg.txt

@@ -257,3 +257,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/italian/errmsg.txt

@@ -255,3 +255,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/japanese/errmsg.txt

@@ -257,3 +257,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/korean/errmsg.txt

@@ -255,3 +255,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/norwegian-ny/errmsg.txt

@@ -257,3 +257,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/norwegian/errmsg.txt

@@ -257,3 +257,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/polish/errmsg.txt

@@ -259,3 +259,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/portuguese/errmsg.txt

@@ -255,3 +255,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/romanian/errmsg.txt

@@ -259,3 +259,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/russian/errmsg.txt

@@ -257,3 +257,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/serbian/errmsg.txt

@@ -251,3 +251,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/slovak/errmsg.txt

@@ -263,3 +263,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/spanish/errmsg.txt

@@ -256,3 +256,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"

sql/share/swedish/errmsg.txt

@@ -255,3 +255,4 @@
 "COLLATION '%s' är inte tillåtet för CHARACTER SET '%s'"
 "Slaven har redan startat"
 "Slaven har redan stoppat"
+"%d rad(er) kapades av group_concat()"

sql/share/ukrainian/errmsg.txt

@@ -260,3 +260,4 @@
 "COLLATION '%s' is not valid for CHARACTER SET '%s'"
 "The slave was already running"
 "The slave was already stopped"
+"%d line(s) was(were) cut by group_concat()"