mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
pem@mysql.com 2003-04-04 14:38:56 +02:00
commit 2c15b36513
23 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sql/share/charsets/Index.xml
View file

@ -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>

1
sql/share/czech/errmsg.txt
View file

@ -264,6 +264,7 @@ 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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/danish/errmsg.txt
View file

@ -258,6 +258,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/dutch/errmsg.txt
View file

@ -266,6 +266,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/estonian/errmsg.txt
View file

@ -260,6 +260,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/french/errmsg.txt
View file

@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

2
sql/share/german/errmsg.txt
View file

@ -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,6 +264,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/greek/errmsg.txt
View file

@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/hungarian/errmsg.txt
View file

@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/italian/errmsg.txt
View file

@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/japanese/errmsg.txt
View file

@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/korean/errmsg.txt
View file

@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/norwegian-ny/errmsg.txt
View file

@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/norwegian/errmsg.txt
View file

@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/polish/errmsg.txt
View file

@ -259,6 +259,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/portuguese/errmsg.txt
View file

@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/romanian/errmsg.txt
View file

@ -259,6 +259,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/russian/errmsg.txt
View file

@ -257,6 +257,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/serbian/errmsg.txt
View file

@ -251,6 +251,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/slovak/errmsg.txt
View file

@ -263,6 +263,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/spanish/errmsg.txt
View file

@ -256,6 +256,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/swedish/errmsg.txt
View file

@ -255,6 +255,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

1
sql/share/ukrainian/errmsg.txt
View file

@ -260,6 +260,7 @@
"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()"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"