Restore a bit of code accidently deleted during merge

sql/item_func.cc: Restore accidently deleted code

Restore a bit of code accidently deleted during merge
sql/item_func.cc: Restore accidently deleted code
c0df79f9 · unknown · 54999b26 · c0df79f9
Commit c0df79f9 authored Jun 01, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/item_func.cc sql/item_func.cc +2 -0

No files found.
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2329,6 +2329,8 @@ longlong Item_func_field::val_int()
  if (cmp_type == STRING_RESULT)
  {
    String *field;
+    if (!(field= args[0]->val_str(&value)))
+      return 0;
    for (uint i=1 ; i < arg_count ; i++)
    {
      String *tmp_value=args[i]->val_str(&tmp);