From da50242988ee9428650b4e52f5b71285bfdcbe4f Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Fri, 4 Apr 2003 17:21:48 +0500
Subject: [PATCH 1/2] Index.xml:   Type

---
 sql/share/charsets/Index.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index 4e8766cea0b..ec93d68ea8f 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -58,7 +58,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
 </charset>
@@ -76,7 +76,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
   <collation name="cp850_bin"	id="80"	order="Binary"	flag="binary"/>
@@ -104,7 +104,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
   <collation name="latin1_general_cs"	id="49">
@@ -114,7 +114,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
 </charset>
@@ -131,7 +131,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
 </charset>
@@ -451,7 +451,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
   <collation name="macroman_bin"	id="53"	order="Binary"	flag="binary"/>
@@ -462,7 +462,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
   <!--collation name="macroman_ci_ai"	id="55"/-->
@@ -473,7 +473,7 @@ To make maintaining easier please:
     <order>German Duden</order>
     <order>Italian</order>
     <order>Latin</order>
-    <order>Pogtuguese</order>
+    <order>Portuguese</order>
     <order>Spanish</order>
   </collation>
 </charset>

From 608cba3f5a7685c3bb5b88f002c6add5cd01b4d1 Mon Sep 17 00:00:00 2001
From: "pem@mysql.com" <>
Date: Fri, 4 Apr 2003 14:23:24 +0200
Subject: [PATCH 2/2] Added missing error message (was only added in english/).
 Removed extraneous error message from german/errmsg.txt.

---
 sql/share/czech/errmsg.txt        | 1 +
 sql/share/danish/errmsg.txt       | 1 +
 sql/share/dutch/errmsg.txt        | 1 +
 sql/share/estonian/errmsg.txt     | 1 +
 sql/share/french/errmsg.txt       | 1 +
 sql/share/german/errmsg.txt       | 2 +-
 sql/share/greek/errmsg.txt        | 1 +
 sql/share/hungarian/errmsg.txt    | 1 +
 sql/share/italian/errmsg.txt      | 1 +
 sql/share/japanese/errmsg.txt     | 1 +
 sql/share/korean/errmsg.txt       | 1 +
 sql/share/norwegian-ny/errmsg.txt | 1 +
 sql/share/norwegian/errmsg.txt    | 1 +
 sql/share/polish/errmsg.txt       | 1 +
 sql/share/portuguese/errmsg.txt   | 1 +
 sql/share/romanian/errmsg.txt     | 1 +
 sql/share/russian/errmsg.txt      | 1 +
 sql/share/serbian/errmsg.txt      | 1 +
 sql/share/slovak/errmsg.txt       | 1 +
 sql/share/spanish/errmsg.txt      | 1 +
 sql/share/swedish/errmsg.txt      | 1 +
 sql/share/ukrainian/errmsg.txt    | 1 +
 22 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 169595c34c5..0f65b118326 100644
--- a/sql/share/czech/errmsg.txt
+++ b/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()"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index ff58079f4c8..ff338b5aaaf 100644
--- a/sql/share/danish/errmsg.txt
+++ b/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()"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index a0a6755c693..8ed3fd28a80 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/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()"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 4503f011692..fd157fb7b0f 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/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()"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 9474d67f2f2..b91e81eff8f 100644
--- a/sql/share/french/errmsg.txt
+++ b/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()"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index ef4110a6b93..26fbeab875c 100644
--- a/sql/share/german/errmsg.txt
+++ b/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()"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 3f54e7740bd..fae3fb788bc 100644
--- a/sql/share/greek/errmsg.txt
+++ b/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()"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 7519448ef33..72271738669 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/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()"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 71a02896c01..bed8c6accc6 100644
--- a/sql/share/italian/errmsg.txt
+++ b/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()"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index b10ddb1d1d2..38d1591b20a 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/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()"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index be1e85ad33c..464365faf09 100644
--- a/sql/share/korean/errmsg.txt
+++ b/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()"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 84c96a0540e..62915658895 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/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()"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index b57eb19906d..9aa2392f251 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/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()"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 2d07b362257..c2380bbae83 100644
--- a/sql/share/polish/errmsg.txt
+++ b/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()"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 8db48115c49..203dd39517d 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/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()"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 337cfd0963e..ca983240dfd 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/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()"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index b5d1a0a7e07..592db5f3648 100644
--- a/sql/share/russian/errmsg.txt
+++ b/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()"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index d6883efc96b..eb6fd0f06f3 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/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()"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index ee7d1e9c4fb..f778cffc00c 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/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()"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 2dfdc7573fa..74b43cd888c 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/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()"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index efdd261ff59..773d4461583 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/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()"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index be8fe2afea5..1ae75f3d877 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/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()"