Commit 7be25714 authored by unknown's avatar unknown
Browse files

Manual merge

parent 93e6eb80

sql/item_func.cc

+4 −0
Original line number Diff line number Diff line
@@ -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;
@@ -3471,6 +3472,9 @@ longlong Item_func_benchmark::val_int() 
    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:

      // This case should never be chosen