Commit 348efa52 authored by unknown's avatar unknown

Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX

and bug #15668: Test 'sp-error' crashes server on Mac OS X.


mysql-test/r/rpl000001.result:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/flush_read_lock_kill.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl000001.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl_error_ignored_table.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
sql/sql_class.cc:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - don't call the close_active_vio() in case of KILL_QUERY.
parent e1a25cb9
......@@ -50,7 +50,7 @@ select (@id := id) - id from t2;
0
kill @id;
drop table t2;
ERROR 08S01: Server shutdown in progress
Got one of the listed errors
set global sql_slave_skip_counter=1;
start slave;
select count(*) from t1;
......
......@@ -42,7 +42,7 @@ connection con1;
# debug build running without our --debug=make_global..., will be
# error 0 (no error). The only important thing to test is that on
# debug builds with our --debug=make_global... we don't hang forever.
--error 0,1053
--error 0,1053,2013
reap;
connection con2;
......
......@@ -92,7 +92,7 @@ kill @id;
# We don't drop t3 as this is a temporary table
drop table t2;
connection master;
--error 1053
--error 1053,2013
reap;
connection slave;
# The SQL slave thread should now have stopped because the query was killed on
......
......@@ -45,7 +45,7 @@ select (@id := id) - id from t3;
kill @id;
drop table t2,t3;
connection master;
--error 0,1053
--error 0,1053,2013
reap;
connection master1;
--replace_column 2 # 5 #
......
......@@ -473,10 +473,12 @@ void THD::awake(THD::killed_state state_to_set)
killed= state_to_set;
if (state_to_set != THD::KILL_QUERY)
{
thr_alarm_kill(real_id);
#ifdef SIGNAL_WITH_VIO_CLOSE
close_active_vio();
close_active_vio();
#endif
}
if (mysys_var)
{
pthread_mutex_lock(&mysys_var->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment