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

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

Browse Source
This commit is contained in:
Sergei Golubchik 2013-07-11 21:40:30 +02:00
parent 7f5d138afd
commit bcbdf5d68a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/signal_demo3.result
View File

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

2
sql/sql_signal.cc
View File

@ -510,7 +510,7 @@ bool Sql_cmd_resignal::execute(THD *thd)
signaled->level, signaled->level,
signaled->message); signaled->message);
if (m_cond == NULL) if (m_cond)
{ {
query_cache_abort(&thd->query_cache_tls); query_cache_abort(&thd->query_cache_tls);