diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-22 15:15:17 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-22 15:15:17 +0200 |
| commit | b35743f9877fc826372eeb6dec21665aa3ff32f4 (patch) | |
| tree | 4361a08c36980010723e75e1bc79c974139e0d6c /storage/xtradb/os/os0sync.c | |
| parent | 58bb0769bdf13a9747e900aa2f0955137738ce9d (diff) | |
| parent | e69b70140b936f59826de9dc79e4bf7f4821d52e (diff) | |
| download | mariadb-git-b35743f9877fc826372eeb6dec21665aa3ff32f4.tar.gz | |
Merge with xtradb code changes
(4 tests are still failing, so this push is not yet stable)
Diffstat (limited to 'storage/xtradb/os/os0sync.c')
| -rw-r--r-- | storage/xtradb/os/os0sync.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/xtradb/os/os0sync.c b/storage/xtradb/os/os0sync.c index f9ab58c2ee4..dba997927cb 100644 --- a/storage/xtradb/os/os0sync.c +++ b/storage/xtradb/os/os0sync.c @@ -442,12 +442,12 @@ os_event_wait_time( return(1000000); /* dummy value to eliminate compiler warn. */ } #else - int err; - int ret = 0; - ulint tmp; + int err; + int ret = 0; + ulint tmp; ib_int64_t old_count; - struct timeval tv_start; - struct timespec timeout; + struct timeval tv_start; + struct timespec timeout; if (wtime == OS_SYNC_INFINITE_TIME) { os_event_wait(event); |