diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-04-03 17:35:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-03 17:35:55 +0400 |
| commit | 15d98ddc2a2d7c733260446e00a85a6865974d6b (patch) | |
| tree | adef2564a3105205d02338b0133c6ad4cce570e8 /sql/mdl.cc | |
| parent | 94d643ac22592e59125214416dac0f5ae42d1260 (diff) | |
| parent | 015868e7da62478a6740c006c9c0366f42628dff (diff) | |
| download | mariadb-git-15d98ddc2a2d7c733260446e00a85a6865974d6b.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index e453ad956eb..db7291d9b6a 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -2134,7 +2134,8 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout) find_deadlock(); struct timespec abs_timeout, abs_shortwait; - set_timespec(abs_timeout, (ulonglong) lock_wait_timeout); + set_timespec_nsec(abs_timeout, + (ulonglong)(lock_wait_timeout * 1000000000ULL)); set_timespec(abs_shortwait, 1); wait_status= MDL_wait::EMPTY; |