summaryrefslogtreecommitdiff
path: root/sql/share/errmsg.txt
diff options
context:
space:
mode:
authorKristofer Pettersson <kpettersson@mysql.com>2008-08-06 16:20:41 +0200
committerKristofer Pettersson <kpettersson@mysql.com>2008-08-06 16:20:41 +0200
commit857a0d6461658d017d11ffecc169347d8c05e4b8 (patch)
treeb8442d02f07dddf8b05b696853145bedf9bf1bdd /sql/share/errmsg.txt
parentb757f48565fc5b0d728015a07e00b3d58e8250c8 (diff)
parentbe7d4dc8eed468bdafe2b4d08919c90607e09243 (diff)
downloadmariadb-git-857a0d6461658d017d11ffecc169347d8c05e4b8.tar.gz
Manual merge 5.0->5.1
Diffstat (limited to 'sql/share/errmsg.txt')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 426290714eb..84eb5f5ba64 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -4718,7 +4718,7 @@ ER_SLAVE_IGNORED_TABLE
swe "Slav SQL tråden ignorerade frågan pga en replicate-*-table regel"
ER_INCORRECT_GLOBAL_LOCAL_VAR
eng "Variable '%-.192s' is a %s variable"
- serbian "Incorrect foreign key definition for '%-.192s': %s"
+ serbian "Promenljiva '%-.192s' je %s promenljiva"
ger "Variable '%-.192s' ist eine %s-Variable"
nla "Variabele '%-.192s' is geen %s variabele"
spa "Variable '%-.192s' es una %s variable"