diff options
| author | unknown <istruewing@chilla.local> | 2007-02-01 19:41:04 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-01 19:41:04 +0100 |
| commit | baddc8bdca29b6e5dad37850ce3012cb60d0afa4 (patch) | |
| tree | fad720adc8764e80870fde40bfd0a6b860c73aa5 /mysys/my_pthread.c | |
| parent | 42236fd910567a479ecdba513da5221a596f06be (diff) | |
| parent | cd4670a7aa270c655dd9a7a45d0c1e05b6f25dd0 (diff) | |
| download | mariadb-git-baddc8bdca29b6e5dad37850ce3012cb60d0afa4.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
client/mysql.cc:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
sql/field_conv.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
Delete: sql/mysqld.cc.rej
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Null merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
Auto merged
BUILD/SETUP.sh:
Manual merged
Makefile.am:
Manual merged
configure.in:
Manual merged
include/my_pthread.h:
Manual merged
mysql-test/Makefile.am:
Manual merged
sql/mysqld.cc:
Manual merged
support-files/mysql.spec.sh:
Manual merged
Diffstat (limited to 'mysys/my_pthread.c')
| -rw-r--r-- | mysys/my_pthread.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 844112991f6..a7bb75d25a8 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -29,6 +29,9 @@ #define SCHED_POLICY SCHED_OTHER #endif +uint thd_lib_detected; +uint thr_client_alarm; + #ifndef my_pthread_setprio void my_pthread_setprio(pthread_t thread_id,int prior) { @@ -332,7 +335,9 @@ void *sigwait_thread(void *set_arg) sigaction(i, &sact, (struct sigaction*) 0); } } - sigaddset(set,THR_CLIENT_ALARM); + /* Ensure that init_thr_alarm() is called */ + DBUG_ASSERT(thr_client_alarm); + sigaddset(set, thr_client_alarm); pthread_sigmask(SIG_UNBLOCK,(sigset_t*) set,(sigset_t*) 0); alarm_thread=pthread_self(); /* For thr_alarm */ |