diff options
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); |