diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:13:18 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-26 00:13:18 +0200 |
| commit | 6e2ee18779d86b12d2c61a10fba4a1ced1ac0b8e (patch) | |
| tree | 9963d8142120b18f86165a9320175d7c29f73903 /mysys/thr_alarm.c | |
| parent | 0a1af05100d2a2b81d6726f29edfab3c9e7453c5 (diff) | |
| download | mariadb-git-6e2ee18779d86b12d2c61a10fba4a1ced1ac0b8e.tar.gz | |
Safety fix (caused a core dump on slave during shutdown when shutting down replication on some OS)
mysql-test/t/rpl_rotate_logs-slave-master-info.opt:
Rename: mysql-test/t/rpl_rotate_logs.slave-mi -> mysql-test/t/rpl_rotate_logs-slave-master-info.opt
mysql-test/t/rpl000015-slave-master-info.opt:
Rename: mysql-test/t/rpl000015.slave-mi -> mysql-test/t/rpl000015-slave-master-info.opt
mysql-test/r/bigint.result:
New bigint test
mysql-test/t/bigint.test:
New bigint test
netware/mysql_test_run.c:
slave-master-info.opt -> .slave-mi
Diffstat (limited to 'mysys/thr_alarm.c')
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 6697b9d3360..add5335a7af 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -402,6 +402,8 @@ void end_thr_alarm(void) void thr_alarm_kill(pthread_t thread_id) { uint i; + if (alarm_aborted) + return; pthread_mutex_lock(&LOCK_alarm); for (i=0 ; i < alarm_queue.elements ; i++) { |