summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2011-01-11 14:04:08 +0200
committerunknown <timour@askmonty.org>2011-01-11 14:04:08 +0200
commitb0be3e2c6834d427c4e652a0203d166625871a35 (patch)
tree555b0a562b8a99bd51b70ad1b7e6ae41faa34e3e /sql/share
parentcb4fa7f401267bf887066100726c53f10b712e6d (diff)
parent2e42948ed3f6eeef5fb61a5d8907ba01dd66f4e3 (diff)
downloadmariadb-git-b0be3e2c6834d427c4e652a0203d166625871a35.tar.gz
Merge MWL#89 into 5.3 main.
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 54061931d5f..252c69afe6c 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -6247,3 +6247,5 @@ ER_UNKNOWN_OPTION
eng "Unknown option '%-.64s'"
ER_BAD_OPTION_VALUE
eng "Incorrect value '%-.64s' for option '%-.64s'"
+ER_ILLEGAL_SUBQUERY_OPTIMIZER_SWITCHES
+ eng "At least one of the 'in_to_exists' or 'materialization' optimizer_switch flags must be 'on'."