bk commit into 5.0 tree (sergefp:1.1978)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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
  1.1978 05/09/10 15:32:07 sergefp@stripped +1 -0
  Fix a valgrind warning.

  sql/sql_select.cc
    1.370 05/09/10 15:32:03 sergefp@stripped +1 -2
    Fix a valgrind warning.

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-merge

--- 1.369/sql/sql_select.cc	2005-09-09 11:44:07 +04:00
+++ 1.370/sql/sql_select.cc	2005-09-10 15:32:03 +04:00
@@ -8041,7 +8041,7 @@
                         bool table_cant_handle_bit_fields,
                         uint convert_blob_length)
 {
-  Item::Type orig_type;
+  Item::Type orig_type= type;
   Item *orig_item;
 
   if (type != Item::FIELD_ITEM &&
@@ -8051,7 +8051,6 @@
   {
     orig_item= item;
     item= item->real_item();
-    orig_type= type;
     type= Item::FIELD_ITEM;
   }
   switch (type) {