summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-10-06 11:03:37 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-10-06 11:03:37 +0400
commit30df032e28bada8aabc1c850799795c728cd96b7 (patch)
tree4d7d8b6e481197bcd1cf04368d7c19316b047527 /sql/share
parent79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff)
parent4d8be2d4f6d7a7b669b7931f1a0ccb5de130fee6 (diff)
downloadmariadb-git-30df032e28bada8aabc1c850799795c728cd96b7.tar.gz
SHOW EXPLAIN: merge with 5.5-main
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 31a6f13e52f..67d8a369a0c 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -4345,13 +4345,13 @@ ER_TOO_MANY_USER_CONNECTIONS 42000
ER_SET_CONSTANTS_ONLY
dan "Du må kun bruge konstantudtryk med SET"
nla "U mag alleen constante expressies gebruiken bij SET"
- eng "You may only use constant expressions with SET"
+ eng "You may only use constant expressions in this statement"
est "Ainult konstantsed suurused on lubatud SET klauslis"
fre "Seules les expressions constantes sont autorisées avec SET"
- ger "Bei SET dürfen nur konstante Ausdrücke verwendet werden"
+ ger "Bei diesem Befehl dürfen nur konstante Ausdrücke verwendet werden"
ita "Si possono usare solo espressioni costanti con SET"
por "Você pode usar apenas expressões constantes com SET"
- rus "Вы можете использовать в SET только константные выражения"
+ rus "С этой командой вы можете использовать только константные выражения"
serbian "Možete upotrebiti samo konstantan iskaz sa komandom 'SET'"
spa "Tu solo debes usar expresiones constantes con SET"
swe "Man kan endast använda konstantuttryck med SET"
@@ -6588,3 +6588,5 @@ ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT
ER_NO_SUCH_TABLE_IN_ENGINE 42S02
eng "Table '%-.192s.%-.192s' doesn't exist in engine"
swe "Det finns ingen tabell som heter '%-.192s.%-.192s' i handlern"
+ER_TARGET_NOT_EXPLAINABLE
+ eng "Target is not running an EXPLAINable command" \ No newline at end of file