summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 1efed78799a..65e1e67c7c6 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -771,7 +771,6 @@ String *Item_param::query_val_str(String* str)
case INT_RESULT:
case REAL_RESULT:
return val_str(str);
- break;
default:
str->set("'", 1, default_charset());
@@ -1972,7 +1971,7 @@ bool field_is_equal_to_item(Field *field,Item *item)
item_result=item->val_str(&item_tmp);
if (item->null_value)
return 1; // This must be true
- field->val_str(&field_tmp,&field_tmp);
+ field->val_str(&field_tmp);
return !stringcmp(&field_tmp,item_result);
}
if (res_type == INT_RESULT)