database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Alternative fix for failure in filesort_debug.test.

Browse Source 
- Make THD::raise_condition() call push_warning() after set_error_status() call.
  (they seem to have accidentally exchanged in this merge cset:
   sergii@pisem.net-20130721143919-7cltcw2l9g29f983)
- Rollback the patch from two csets before (the one with comment:
   Update filesort_debug.test (see comment #1 in MDEV-4786 for analysis))
This commit is contained in:
Sergey Petrunya
2013-07-24 14:43:57 +04:00
parent c451c87fb7
commit be39bcccec
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_class.cc
View File

@@ -1202,18 +1202,6 @@ Sql_condition* THD::raise_condition(uint sql_errno,
if (handle_condition(sql_errno, sqlstate, level, msg, &cond))
DBUG_RETURN(cond);
/*
Avoid pushing a condition for fatal out of memory errors as this will
require memory allocation and therefore might fail. Non fatal out of
memory errors can occur if raised by SIGNAL/RESIGNAL statement.
*/
if (!(is_fatal_error && (sql_errno == EE_OUTOFMEMORY ||
sql_errno == ER_OUTOFMEMORY)))
{
cond= da->push_warning(this, sql_errno, sqlstate, level, msg);
}
if (level == Sql_condition::WARN_LEVEL_ERROR)
{
is_slave_error= 1; // needed to catch query errors during replication
@@ -1227,6 +1215,16 @@ Sql_condition* THD::raise_condition(uint sql_errno,
query_cache_abort(&query_cache_tls);
/*
Avoid pushing a condition for fatal out of memory errors as this will
require memory allocation and therefore might fail. Non fatal out of
memory errors can occur if raised by SIGNAL/RESIGNAL statement.
*/
if (!(is_fatal_error && (sql_errno == EE_OUTOFMEMORY ||
sql_errno == ER_OUTOFMEMORY)))
{
cond= da->push_warning(this, sql_errno, sqlstate, level, msg);
}
DBUG_RETURN(cond);
}