diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-27 23:19:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-27 23:19:53 +0200 |
| commit | 13bb3fa823245bddd051482b2efb455557b8b726 (patch) | |
| tree | 56cac424776cf6a57ff89f53ecad4a0d669e0552 /mysys/thr_alarm.c | |
| parent | c1477a3f20897905f3835c4377c9e88841fdd4bb (diff) | |
| download | mariadb-git-13bb3fa823245bddd051482b2efb455557b8b726.tar.gz | |
Disabled syncronization test at it fails on multiple platforms. (Bug #24529)
Fixed that test_thr_alarm works
mysql-test/mysql-test-run.pl:
Fixed typo
mysql-test/r/synchronization.result:
Updated results
mysql-test/t/disabled.def:
Disabled syncronization test at it fails on multiple platforms. (Bug #24529)
mysql-test/t/synchronization.test:
Drop used tables
mysys/Makefile.am:
Added 'debug' to be able to build test cases
mysys/thr_alarm.c:
Fixed test case
Diffstat (limited to 'mysys/thr_alarm.c')
| -rw-r--r-- | mysys/thr_alarm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index c55cc32b47d..dbadc45ae9f 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -276,7 +276,7 @@ sig_handler process_alarm(int sig __attribute__((unused))) if (!pthread_equal(pthread_self(),alarm_thread)) { #if defined(MAIN) && !defined(__bsdi__) - printf("thread_alarm\n"); fflush(stdout); + printf("thread_alarm in process_alarm\n"); fflush(stdout); #endif #ifdef DONT_REMEMBER_SIGNAL my_sigset(THR_CLIENT_ALARM,process_alarm); /* int. thread system calls */ @@ -848,8 +848,9 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused))) MY_INIT(argv[0]); if (argc > 1 && argv[1][0] == '-' && argv[1][1] == '#') + { DBUG_PUSH(argv[1]+2); - + } pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST); pthread_cond_init(&COND_thread_count,NULL); @@ -917,8 +918,8 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused))) } } pthread_mutex_unlock(&LOCK_thread_count); - end_thr_alarm(1); thr_alarm_info(&alarm_info); + end_thr_alarm(1); printf("Main_thread: Alarms: %u max_alarms: %u next_alarm_time: %lu\n", alarm_info.active_alarms, alarm_info.max_used_alarms, alarm_info.next_alarm_time); |