diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-10 22:32:02 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-10 22:32:02 +0300 |
| commit | d0e973a3b0fc4384b8aeebfa6509a653b07b7eac (patch) | |
| tree | 91f56956e012dd5877ea8110234e86c92f36bc4c /sql/share | |
| parent | f516b966e131177244941319c553e138fbf9f6ff (diff) | |
| download | mariadb-git-d0e973a3b0fc4384b8aeebfa6509a653b07b7eac.tar.gz | |
Fixed merge problems to allow mysql-test suite 'main' to pass
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index f2a5666f1b1..38b05ca9dce 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7152,13 +7152,10 @@ ER_DUP_QUERY_NAME eng "Duplicate query name in WITH clause" ER_WRONG_ORDER_IN_WITH_CLAUSE eng "The definition of the table '%s' refers to the table '%s' defined later in a non-recursive WITH clause" -ER_RECURSIVE_QUERY_IN_WITH_CLAUSE - eng "Recursive queries in WITH clause are not supported yet" ER_RECURSIVE_WITHOUT_ANCHORS eng "No anchors for recursive WITH element '%s'" ER_REF_TO_RECURSIVE_WITH_TABLE_IN_DERIVED eng "Reference to recursive WITH table '%s' in materiazed derived" - # # Internal errors, not used # |