diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-26 22:44:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-26 22:45:46 +0300 |
| commit | 8c81f24d1bedb11364288d42d5492e76816fe20a (patch) | |
| tree | aade13bca6207b89634b2b87db16e18301e9ec0e /sql/item_func.cc | |
| parent | 8f643e2063c9890a353149f39ef85b2cf3151fd0 (diff) | |
| parent | 808f18c748a98dcc7df0b8154563153c8527d3f0 (diff) | |
| download | mariadb-git-8c81f24d1bedb11364288d42d5492e76816fe20a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 8031788cadf..8529a1d08ca 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3917,6 +3917,7 @@ longlong Item_master_gtid_wait::val_int() { DBUG_ASSERT(fixed == 1); longlong result= 0; + String *gtid_pos = args[0]->val_str(&value); if (args[0]->null_value) { @@ -3928,7 +3929,6 @@ longlong Item_master_gtid_wait::val_int() #ifdef HAVE_REPLICATION THD* thd= current_thd; longlong timeout_us; - String *gtid_pos = args[0]->val_str(&value); if (arg_count==2 && !args[1]->null_value) timeout_us= (longlong)(1e6*args[1]->val_real()); |