summaryrefslogtreecommitdiff
path: root/sql/share/errmsg.txt
diff options
context:
space:
mode:
authorgshchepa/uchum@gleb.loc <>2007-08-03 02:15:21 +0500
committergshchepa/uchum@gleb.loc <>2007-08-03 02:15:21 +0500
commitd933b0b4a05eba9e56c4479d79462dd6f9b40dba (patch)
treec3533e82d947e58c3e943074ef1781a098306c50 /sql/share/errmsg.txt
parente9eb6309fbc2b49d8d04d92b7039c986782a33dd (diff)
parent176a20f22ba23aae0c20f126d1ee591dd0935b15 (diff)
downloadmariadb-git-d933b0b4a05eba9e56c4479d79462dd6f9b40dba.tar.gz
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
Diffstat (limited to 'sql/share/errmsg.txt')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 682eee06e02..3c9ee2073b8 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5654,6 +5654,8 @@ ER_NON_INSERTABLE_TABLE
ger "Die Zieltabelle %-.100s von %s ist nicht einfügbar"
ER_ADMIN_WRONG_MRG_TABLE
eng "Table '%-.64s' is differently defined or of non-MyISAM type or doesn't exist"
+ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT
+ eng "Too high level of nesting for select"
ER_FOREIGN_SERVER_EXISTS
eng "The foreign server, %s, you are trying to create already exists."
ER_FOREIGN_SERVER_DOESNT_EXIST