diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
| commit | e9c1701e11e2441435223cc7c00c467f58aaff19 (patch) | |
| tree | 6be7d0e8fe87272e1abb2704fdb9859481d8acc2 /storage/innobase/ut/ut0wqueue.cc | |
| parent | 17794fb9aac9ca4fcb0b1e5904671a025a1b6b74 (diff) | |
| parent | f3eb82f048d342c11fc3869eca2e6faed9a4835d (diff) | |
| download | mariadb-git-e9c1701e11e2441435223cc7c00c467f58aaff19.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/ut/ut0wqueue.cc')
| -rw-r--r-- | storage/innobase/ut/ut0wqueue.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/ut/ut0wqueue.cc b/storage/innobase/ut/ut0wqueue.cc index 4697aa2fc46..026431695ed 100644 --- a/storage/innobase/ut/ut0wqueue.cc +++ b/storage/innobase/ut/ut0wqueue.cc @@ -135,7 +135,7 @@ ib_wqueue_timedwait( /*================*/ /* out: work item or NULL on timeout*/ ib_wqueue_t* wq, /* in: work queue */ - ib_time_t wait_in_usecs) /* in: wait time in micro seconds */ + ulint wait_in_usecs) /* in: wait time in micro seconds */ { ib_list_node_t* node = NULL; |