summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-07-11 21:40:30 +0200
committerSergei Golubchik <sergii@pisem.net>2013-07-11 21:40:30 +0200
commitbcbdf5d68a8c0de33f7b8656065abb526ac83dd3 (patch)
treee7339a4bf2550cdbca47c2e4a11d1dc73a560de7 /sql
parent7f5d138afd1ad9c261bd9e9d58dae829a98ff8fe (diff)
downloadmariadb-git-bcbdf5d68a8c0de33f7b8656065abb526ac83dd3.tar.gz
fix signal_demo3.test: fix a typo in the merge, and update results to match 5.6
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_signal.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc
index ab5003fa86a..a0a47b77591 100644
--- a/sql/sql_signal.cc
+++ b/sql/sql_signal.cc
@@ -510,7 +510,7 @@ bool Sql_cmd_resignal::execute(THD *thd)
signaled->level,
signaled->message);
- if (m_cond == NULL)
+ if (m_cond)
{
query_cache_abort(&thd->query_cache_tls);