bk commit into 5.1 tree (malff:1.2449)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-03-01 20:04:49-07:00, malff@weblab.(none) +1 -0
  Manual merge

  sql/item_func.cc@stripped, 2007-03-01 20:04:46-07:00, malff@weblab.(none) +4 -0
    Manual merge

# 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:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-26093-merge

--- 1.358/sql/item_func.cc	2007-03-01 20:04:55 -07:00
+++ 1.359/sql/item_func.cc	2007-03-01 20:04:55 -07:00
@@ -3447,6 +3447,7 @@ longlong Item_func_benchmark::val_int()
   DBUG_ASSERT(fixed == 1);
   char buff[MAX_FIELD_WIDTH];
   String tmp(buff,sizeof(buff), &my_charset_bin);
+  my_decimal tmp_decimal;
   THD *thd=current_thd;
   ulong loop_count;
 
@@ -3470,6 +3471,9 @@ longlong Item_func_benchmark::val_int()
       break;
     case STRING_RESULT:
       (void) args[1]->val_str(&tmp);
+      break;
+    case DECIMAL_RESULT:
+      (void) args[1]->val_decimal(&tmp_decimal);
       break;
     case ROW_RESULT:
     default: