diff options
| author | pem@mysql.com <> | 2005-10-17 15:07:47 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2005-10-17 15:07:47 +0200 |
| commit | e58531570371b640e963d01e5714b636e7bad82b (patch) | |
| tree | d16ca31453be37d53895be07584765b1337a6698 /sql/sql_error.cc | |
| parent | 6a88684eb3580bbf23815c87abb4e027283e1474 (diff) | |
| download | mariadb-git-e58531570371b640e963d01e5714b636e7bad82b.tar.gz | |
Additional fix for BUG#7049, after review.
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 2e262569386..191a6e0a1fd 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -144,6 +144,8 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, thd->really_abort_on_warning()) ? MYSQL_ERROR::WARN_LEVEL_ERROR : level)) { + if (! thd->spcont->found_handler_here()) + thd->net.report_error= 1; /* Make "select" abort correctly */ DBUG_RETURN(NULL); } query_cache_abort(&thd->net); |