diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-09-27 13:22:38 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-05 15:02:51 +0400 |
| commit | 7fa1ad14dca4850caee52e75d69eae441af3f824 (patch) | |
| tree | 6da9a4b31390a3e83b1e2282e1b55cefd46d9cb8 /sql/sp_pcontext.cc | |
| parent | 76714a5c9a4c05fa7084f2c562a9eb50a0b7bd17 (diff) | |
| download | mariadb-git-7fa1ad14dca4850caee52e75d69eae441af3f824.tar.gz | |
MDEV-10840 sql_mode=ORACLE: RAISE statement for predefined exceptions
Diffstat (limited to 'sql/sp_pcontext.cc')
| -rw-r--r-- | sql/sp_pcontext.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc index daf8a6febd0..20ff92e3cf1 100644 --- a/sql/sp_pcontext.cc +++ b/sql/sp_pcontext.cc @@ -289,16 +289,20 @@ sp_condition_value *sp_pcontext::find_condition(const LEX_STRING name, static sp_condition_value - cond_invalid_cursor(ER_SP_CURSOR_NOT_OPEN), - cond_no_data_found(ER_SP_FETCH_NO_DATA), - cond_dup_val_on_index(ER_DUP_ENTRY), - cond_too_many_rows(ER_TOO_MANY_ROWS); + // Warnings + cond_no_data_found(ER_SP_FETCH_NO_DATA, "01000"), + // Errors + cond_invalid_cursor(ER_SP_CURSOR_NOT_OPEN, "24000"), + cond_dup_val_on_index(ER_DUP_ENTRY, "23000"), + cond_too_many_rows(ER_TOO_MANY_ROWS, "42000"); static sp_condition sp_predefined_conditions[]= { - sp_condition(C_STRING_WITH_LEN("INVALID_CURSOR"), &cond_invalid_cursor), + // Warnings sp_condition(C_STRING_WITH_LEN("NO_DATA_FOUND"), &cond_no_data_found), + // Errors + sp_condition(C_STRING_WITH_LEN("INVALID_CURSOR"), &cond_invalid_cursor), sp_condition(C_STRING_WITH_LEN("DUP_VAL_ON_INDEX"), &cond_dup_val_on_index), sp_condition(C_STRING_WITH_LEN("TOO_MANY_ROWS"), &cond_too_many_rows) }; |