diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-11 06:44:45 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-11 06:44:45 +0300 |
| commit | d221f3ff172305e4576505180408e4ac2ba2a6c2 (patch) | |
| tree | 9f13bcfe6e049a7e4fbad2a5da068a0635d8b038 /mysys/thr_alarm.c | |
| parent | f30b0eacedb213edc35f19ecdd861cd4bf1e8d87 (diff) | |
| parent | 8f232cb75f0dce72142e2b584f2cdac4a1de517d (diff) | |
| download | mariadb-git-d221f3ff172305e4576505180408e4ac2ba2a6c2.tar.gz | |
merge
mysys/thr_alarm.c:
Auto merged
sql/sql_table.cc:
Auto merged
Docs/manual.texi:
merge (Removed bug fix comments for not relesed version)
Diffstat (limited to 'mysys/thr_alarm.c')
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index c3438808a45..d1343d4c2d3 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -655,6 +655,7 @@ sig_handler process_alarm(int sig __attribute__((unused))) bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm) { + (*alrm)= &alarm->alarmed; if (alarm_aborted) { alarm->alarmed.crono=0; @@ -663,7 +664,6 @@ bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm) if (!(alarm->alarmed.crono=SetTimer((HWND) NULL,0, sec*1000, (TIMERPROC) NULL))) return 1; - (*alrm)= &alarm->alarmed; return 0; } |