summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <gshchepa/uchum@gleb.loc>2007-08-14 13:44:15 +0500
committerunknown <gshchepa/uchum@gleb.loc>2007-08-14 13:44:15 +0500
commitde619bd17c69453dc115fad746719b0751de87f5 (patch)
tree53eaf037f0205e6fad795d1db3d180a456adb0c0 /sql/share
parentc4ba195a7ec99221d249d781d96f908bf1e5518a (diff)
parent5c5233cd2b71fc28a07fbe9d9f625702bcb85ce6 (diff)
downloadmariadb-git-de619bd17c69453dc115fad746719b0751de87f5.tar.gz
Merge gleb.loc:/home/uchum/work/bk/5.0
into gleb.loc:/home/uchum/work/bk/5.0-opt
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 a52ffa8216c..6d4ca33ccc7 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5635,3 +5635,5 @@ ER_NON_INSERTABLE_TABLE
eng "The target table %-.100s of the %s is not insertable-into"
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"