bk commit into 5.0 tree (gkodinov:1.2403) BUG#22344

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-09 11:05:23+02:00, gkodinov@stripped +1 -0
  Addendum to fix of bug #22344 : removed dead code.

  sql/item.cc@stripped, 2007-02-09 11:05:17+02:00, gkodinov@stripped +1 -12
    Addendum to fix of bug #22344 : removed dead code.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B22344-5.0-opt

--- 1.253/sql/item.cc	2007-02-06 11:08:50 +02:00
+++ 1.254/sql/item.cc	2007-02-09 11:05:17 +02:00
@@ -5277,18 +5277,7 @@ my_decimal *Item_ref::val_decimal(my_dec
 int Item_ref::save_in_field(Field *to, bool no_conversions)
 {
   int res;
-  if (result_field)
-  {
-    if (result_field->is_null())
-    {
-      null_value= 1;
-      return set_field_to_null_with_conversions(to, no_conversions);
-    }
-    to->set_notnull();
-    res= field_conv(to, result_field);
-    null_value= 0;
-    return res;
-  }
+  DBUG_ASSERT(!result_field);
   res= (*ref)->save_in_field(to, no_conversions);
   null_value= (*ref)->null_value;
   return res;