1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Additional fix for BUG#7049, after review.

Browse Source 
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
This commit is contained in:
pem@mysql.com 2005-10-17 15:07:47 +02:00
parent 6a88684eb3
commit e585315703
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/sp.result
View File

@ -3310,7 +3310,6 @@ select 1|
1 1
call bug12379_1()| call bug12379_1()|
bug12379() bug12379()
NULL
42 42
42 42
select 2| select 2|
@ -3318,7 +3317,6 @@ select 2|
2 2
call bug12379_2()| call bug12379_2()|
bug12379() bug12379()
NULL
select 3| select 3|
3 3
3 3

2
sql/mysqld.cc
View File

@ -2342,6 +2342,8 @@ static int my_message_sql(uint error, const char *str, myf MyFlags)
if (thd->spcont && if (thd->spcont &&
thd->spcont->find_handler(error, MYSQL_ERROR::WARN_LEVEL_ERROR)) thd->spcont->find_handler(error, MYSQL_ERROR::WARN_LEVEL_ERROR))
{ {
if (! thd->spcont->found_handler_here())
thd->net.report_error= 1; /* Make "select" abort correctly */
DBUG_RETURN(0); DBUG_RETURN(0);
} }

4
sql/protocol.cc
View File

@ -76,6 +76,8 @@ void net_send_error(THD *thd, uint sql_errno, const char *err)
if (thd->spcont && thd->spcont->find_handler(sql_errno, if (thd->spcont && thd->spcont->find_handler(sql_errno,
MYSQL_ERROR::WARN_LEVEL_ERROR)) MYSQL_ERROR::WARN_LEVEL_ERROR))
{ {
if (! thd->spcont->found_handler_here())
thd->net.report_error= 1; /* Make "select" abort correctly */
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
thd->query_error= 1; // needed to catch query errors during replication thd->query_error= 1; // needed to catch query errors during replication
@ -181,6 +183,8 @@ net_printf_error(THD *thd, uint errcode, ...)
if (thd->spcont && thd->spcont->find_handler(errcode, if (thd->spcont && thd->spcont->find_handler(errcode,
MYSQL_ERROR::WARN_LEVEL_ERROR)) MYSQL_ERROR::WARN_LEVEL_ERROR))
{ {
if (! thd->spcont->found_handler_here())
thd->net.report_error= 1; /* Make "select" abort correctly */
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
thd->query_error= 1; // needed to catch query errors during replication thd->query_error= 1; // needed to catch query errors during replication

7
sql/sp_rcontext.h
View File

@ -149,6 +149,13 @@ class sp_rcontext : public Sql_alloc
return m_handler[m_hfound].type; return m_handler[m_hfound].type;
} }
// Returns true if we found a handler in this context
inline bool
found_handler_here()
{
return (m_hfound >= 0);
}
// Clears the handler find state // Clears the handler find state
inline void inline void
clear_handler() clear_handler()

2
sql/sql_error.cc
View File

@ -144,6 +144,8 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
thd->really_abort_on_warning()) ? thd->really_abort_on_warning()) ?
MYSQL_ERROR::WARN_LEVEL_ERROR : level)) MYSQL_ERROR::WARN_LEVEL_ERROR : level))
{ {
if (! thd->spcont->found_handler_here())
thd->net.report_error= 1; /* Make "select" abort correctly */
DBUG_RETURN(NULL); DBUG_RETURN(NULL);
} }
query_cache_abort(&thd->net); query_cache_abort(&thd->net);