fix signal_demo3.test: fix a typo in the merge, and update results to match 5.6

mysql-test/r/signal_demo3.result

@@ -77,7 +77,7 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
+Error	1051	Unknown table 'demo.oops_it_is_not_here'
 Error	1644	Oops in proc_9
 Error	1644	Oops in proc_8
 Error	1644	Oops in proc_7
@@ -95,11 +95,11 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
-Error	1644	Oops in proc_9
-Error	1644	Oops in proc_8
-Error	1644	Oops in proc_7
-Error	1644	Oops in proc_6
+Error	1644	Oops in proc_5
+Error	1644	Oops in proc_4
+Error	1644	Oops in proc_3
+Error	1644	Oops in proc_2
+Error	1644	Oops in proc_1
 SET @@session.max_error_count = 7;
 SELECT @@session.max_error_count;
 @@session.max_error_count
@@ -108,13 +108,13 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
-Error	1644	Oops in proc_9
-Error	1644	Oops in proc_8
 Error	1644	Oops in proc_7
 Error	1644	Oops in proc_6
 Error	1644	Oops in proc_5
 Error	1644	Oops in proc_4
+Error	1644	Oops in proc_3
+Error	1644	Oops in proc_2
+Error	1644	Oops in proc_1
 SET @@session.max_error_count = 9;
 SELECT @@session.max_error_count;
 @@session.max_error_count
@@ -123,7 +123,6 @@ call proc_1();
 ERROR 45000: Oops in proc_1
 show warnings;
 Level	Code	Message
-Error	1051	Unknown table 'oops_it_is_not_here'
 Error	1644	Oops in proc_9
 Error	1644	Oops in proc_8
 Error	1644	Oops in proc_7
@@ -132,6 +131,7 @@ Error	1644	Oops in proc_5
 Error	1644	Oops in proc_4
 Error	1644	Oops in proc_3
 Error	1644	Oops in proc_2
+Error	1644	Oops in proc_1
 drop database demo;
 SET @@global.max_error_count = @start_global_value;
 SELECT @@global.max_error_count;

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);