summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authortsmith@ramayana.hindu.god <>2007-08-15 15:48:57 -0600
committertsmith@ramayana.hindu.god <>2007-08-15 15:48:57 -0600
commita5fdd2332bcfbdd92958c4009d1dd80168b585d9 (patch)
tree992a8edd504f9a67e4f9653773ae3905e0b00aa6 /sql/share
parentbadc34bd8180c7ea796a6f1e361ae2778e382894 (diff)
parent9308d4349066475639c4241d551369db355c00c9 (diff)
downloadmariadb-git-a5fdd2332bcfbdd92958c4009d1dd80168b585d9.tar.gz
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
Diffstat (limited to 'sql/share')
-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 966e841ccbf..8ecba1d4be0 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