diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-05 17:33:38 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-05 17:33:38 +0300 |
| commit | 64d11bb395348ec002760d5354fbec0e373db593 (patch) | |
| tree | 2f66999790d27b10bd1ddb8bdc47741a04c5c502 /include | |
| parent | ad5e39bf12b7aeefbc313e464a1349541a7b15c5 (diff) | |
| parent | a3afb2bcbea96d4c5a326204151fb63cd0411aec (diff) | |
| download | mariadb-git-64d11bb395348ec002760d5354fbec0e373db593.tar.gz | |
Merge with 4.0.13
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/thr_alarm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 439f046252f..8ff4472f700 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -100,7 +100,7 @@ typedef struct st_alarm { #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) void init_thr_alarm(uint max_alarm); -bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff); +my_bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff); void thr_alarm_kill(pthread_t thread_id); void thr_end_alarm(thr_alarm_t *alarmed); void end_thr_alarm(my_bool free_structures); |