summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2014-11-30 01:05:34 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2014-11-30 01:05:34 -0500
commit3e792e6cbccb5d7bf5b84b38336f8a40ad232020 (patch)
treecb469f8e4028c03911a60d59f3392e53c86b3a8d /sql/item_func.cc
parent5298e21c32666f558b2ecdfee12df493d87d4e07 (diff)
downloadmariadb-git-3e792e6cbccb5d7bf5b84b38336f8a40ad232020.tar.gz
MDEV-4018 : Feature Request: microseconds in GET_LOCK()
Updated MDL_context's lock methods to accept double precision lock_wait_timeout.
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 25c0197cb9b..30a9aa9821c 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4257,7 +4257,7 @@ longlong Item_func_get_lock::val_int()
{
DBUG_ASSERT(fixed == 1);
String *res= args[0]->val_str(&value);
- ulonglong timeout= args[1]->val_int();
+ double timeout= args[1]->val_real();
THD *thd= current_thd;
User_level_lock *ull;
DBUG_ENTER("Item_func_get_lock::val_int");