diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-20 09:31:13 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-20 09:31:13 +0100 |
| commit | 2fc3dc393d396647a220b286780f31d244ac2c53 (patch) | |
| tree | 51daa37fb127f8f77157548a51907fcd793463ae /sql/mdl.cc | |
| parent | e52c753ab9c3315ca4b5a645b66da807ec6d7821 (diff) | |
| parent | 1e156e1436f931625b7a5573584a786388979de2 (diff) | |
| download | mariadb-git-2fc3dc393d396647a220b286780f31d244ac2c53.tar.gz | |
Merge branch '10.1' into bb-10.1-serg
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 73b64b35dff..ab4f5288d4a 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -2037,7 +2037,7 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout) find_deadlock(); struct timespec abs_timeout, abs_shortwait; - set_timespec(abs_timeout, lock_wait_timeout); + set_timespec(abs_timeout, (ulonglong) lock_wait_timeout); set_timespec(abs_shortwait, 1); wait_status= MDL_wait::EMPTY; |