Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
6b20a480 · Sinisa@sinisa.nasamreza.org · dd538218 · 08fbd479 · 6b20a480 · 6b20a480
Commit 6b20a480 authored Aug 28, 2002 by Sinisa@sinisa.nasamreza.org
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/opt_range.cc sql/opt_range.cc +1 -1

sql/sql_base.cc sql/sql_base.cc +1 -1

No files found.
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1028,7 +1028,7 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
      field->cmp_type() != value->result_type())
    DBUG_RETURN(0);
-  if (value->save_in_field(field) == 1)
+  if (value->save_in_field(field) > 0)
  {
    if (type == Item_func::EQUAL_FUNC)
    {

--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2113,7 +2113,7 @@ fill_record(List<Item> &fields,List<Item> &values)
  while ((field=(Item_field*) f++))
  {
    value=v++;
-    if (value->save_in_field(field->field) == 1)
+    if (value->save_in_field(field->field) > 0)
      DBUG_RETURN(1);
  }
  DBUG_RETURN(0);