diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-16 15:07:04 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-16 15:07:04 +0300 |
| commit | 8543621fa0f4a3c4102ac8f799888ef79e2e1dcf (patch) | |
| tree | 29e8f301ef929cfe1c00eec9dee265aa0acaa350 /sql/share | |
| parent | f458e198c0bea67c6a3787738108bbfb139639bd (diff) | |
| parent | bcee6652c6052cabd67f8d30c14e162235749d38 (diff) | |
| download | mariadb-git-8543621fa0f4a3c4102ac8f799888ef79e2e1dcf.tar.gz | |
Merge with 5.3 main
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index d51fb3b181d..547d9bdf0be 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6269,3 +6269,5 @@ ER_DYN_COL_DATA 22007 eng "Illegal value used as argument of dynamic column function" ER_DYN_COL_WRONG_CHARSET eng "Dynamic column contains unknown character set" +ER_ILLEGAL_SUBQUERY_OPTIMIZER_SWITCHES + eng "At least one of the 'in_to_exists' or 'materialization' optimizer_switch flags must be 'on'." |