diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-22 17:54:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-22 17:54:07 +0100 |
| commit | fd8d108c5bd30643be5d815c30e8b63d63e36dcb (patch) | |
| tree | 632c823f1194beb85a1fc50f4546ca9a5e749b15 /sql/share | |
| parent | 16f0c9f606ca2ea27fabf97b85fe3e7a15380892 (diff) | |
| parent | bac1c946ceb094552302d86931c54d7679c4caba (diff) | |
| download | mariadb-git-fd8d108c5bd30643be5d815c30e8b63d63e36dcb.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum
into pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 598139b6059..5808a8399e4 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -1479,7 +1479,7 @@ 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)" + cze "Zdvojen-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" |