diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-08-04 23:40:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-04 23:40:25 +0200 |
| commit | 006ffca56e0638f14152f4ba97ecfc7bfe08d773 (patch) | |
| tree | c68319e901cba44b4d10d3028191b485a423c718 /sql/item_func.cc | |
| parent | d71b584069ff950ea642b8efd1561244b826a61e (diff) | |
| download | mariadb-git-006ffca56e0638f14152f4ba97ecfc7bfe08d773.tar.gz | |
after-merge fixes
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 4d7e10b6577..da688689148 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4268,6 +4268,7 @@ longlong Item_func_get_lock::val_int() if (thd->slave_thread) { null_value= 0; + DBUG_RETURN(1); } if (args[1]->null_value || @@ -4284,10 +4285,6 @@ longlong Item_func_get_lock::val_int() null_value= 1; DBUG_RETURN(0); } - { - null_value= 0; - DBUG_RETURN(1); - } if (!ull_name_ok(res)) DBUG_RETURN(0); |