diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-04-07 00:54:39 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-04-07 00:54:39 +0300 |
| commit | 59e5f5b47e1f12a1426319a905dbc8cc55219c0d (patch) | |
| tree | b2095faf431949d31e2ea69200bea27a8cf2f629 /sql/share | |
| parent | 306de8a927916db98c67fa338b5a275735f78240 (diff) | |
| parent | 89b744eb6c2484412f476a53087cea7bf28dc917 (diff) | |
| download | mariadb-git-59e5f5b47e1f12a1426319a905dbc8cc55219c0d.tar.gz | |
Merge branch '10.2' into bb-10.2-mdev9543
- Make Window Functions errors use the MariaDB's extra error range.
- Fix a trivial bug in check_error_mesg
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index d6b180b79aa..376c1eb9d0d 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7154,6 +7154,21 @@ 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" + +# +# Internal errors, not used +# +skip-to-error-number 2000 + +# MySQL 5.7 error numbers starts here +skip-to-error-number 3000 + +ER_MYSQL_57_TEST + eng "5.7 test" + +# MariaDB extra error numbers starts from 4000 +skip-to-error-number 4000 + ER_WRONG_WINDOW_SPEC_NAME eng "Window specification with name '%s' is not defined" ER_DUP_WINDOW_NAME |