mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
This commit is contained in:
ramil@mysql.com 2005-12-14 21:42:08 +04:00
parent 138ec21cc9
commit 04cff0d055
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/rpl000001.result
View file

@ -50,7 +50,7 @@ select (@id := id) - id from t2;
0 0
kill @id; kill @id;
drop table t2; drop table t2;
ERROR 08S01: Server shutdown in progress Got one of the listed errors
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
start slave; start slave;
select count(*) from t1; select count(*) from t1;

2
mysql-test/t/flush_read_lock_kill.test
View file

@ -42,7 +42,7 @@ connection con1;
# debug build running without our --debug=make_global..., will be # debug build running without our --debug=make_global..., will be
# error 0 (no error). The only important thing to test is that on # 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. # debug builds with our --debug=make_global... we don't hang forever.
--error 0,1053 --error 0,1053,2013
reap; reap;
connection con2; connection con2;

2
mysql-test/t/rpl000001.test
View file

@ -92,7 +92,7 @@ kill @id;
# We don't drop t3 as this is a temporary table # We don't drop t3 as this is a temporary table
drop table t2; drop table t2;
connection master; connection master;
--error 1053 --error 1053,2013
reap; reap;
connection slave; connection slave;
# The SQL slave thread should now have stopped because the query was killed on # The SQL slave thread should now have stopped because the query was killed on

2
mysql-test/t/rpl_error_ignored_table.test
View file

@ -45,7 +45,7 @@ select (@id := id) - id from t3;
kill @id; kill @id;
drop table t2,t3; drop table t2,t3;
connection master; connection master;
--error 0,1053 --error 0,1053,2013
reap; reap;
connection master1; connection master1;
--replace_column 2 # 5 # --replace_column 2 # 5 #

2
sql/sql_class.cc
View file

@ -473,10 +473,12 @@ void THD::awake(THD::killed_state state_to_set)
killed= state_to_set; killed= state_to_set;
if (state_to_set != THD::KILL_QUERY) if (state_to_set != THD::KILL_QUERY)
{
thr_alarm_kill(real_id); thr_alarm_kill(real_id);
#ifdef SIGNAL_WITH_VIO_CLOSE #ifdef SIGNAL_WITH_VIO_CLOSE
close_active_vio(); close_active_vio();
#endif #endif
}
if (mysys_var) if (mysys_var)
{ {
pthread_mutex_lock(&mysys_var->mutex); pthread_mutex_lock(&mysys_var->mutex);