diff options
| author | kostja@bodhi.(none) <> | 2007-10-30 22:35:14 +0300 |
|---|---|---|
| committer | kostja@bodhi.(none) <> | 2007-10-30 22:35:14 +0300 |
| commit | 230604f33c12b760694473af51ffae59fd4c9536 (patch) | |
| tree | cec4d96b963f5aa61730d7316e2a90adf6331662 /sql/sql_error.cc | |
| parent | cd72fffa5fd3456e2e04ceb1fc51737fe8ceab4b (diff) | |
| download | mariadb-git-230604f33c12b760694473af51ffae59fd4c9536.tar.gz | |
In ha_delete_table, use a standard mechanism to intercept the error message
and convert it to a warning instead of direct manipulation with the
thread error stack.
Fix a bug in handler::print_erorr when a garbled message was
printed for HA_ERR_NO_SUCH_TABLE.
This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 8bdb2e59ed5..89cff73d153 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -137,7 +137,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, level= MYSQL_ERROR::WARN_LEVEL_ERROR; } - if (thd->handle_error(code, level)) + if (thd->handle_error(code, msg, level)) DBUG_RETURN(NULL); if (thd->spcont && |