← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Brian Aker
  • Date: 2009-11-11 15:49:59 UTC
  • mto: This revision was merged to the branch mainline in revision 1212.
  • Revision ID: brian@gaz-20091111154959-jqu64e48gp9ig3tp
Updating with my change to to DECIMAL from NEWDECIMAL and Stewart's update
for protobuf to correctly store DECIMAL

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
517
517
                               name, table->s, collation.collation);
518
518
    break;
519
519
  case DECIMAL_RESULT:
520
 
    field= new Field_new_decimal(max_length, maybe_null, name,
 
520
    field= new Field_decimal(max_length, maybe_null, name,
521
521
                                 decimals, unsigned_flag);
522
522
    break;
523
523
  case ROW_RESULT:
980
980
  case DECIMAL_RESULT:
981
981
    val.traits= Hybrid_type_traits_decimal::instance();
982
982
    if (table_field_type != DRIZZLE_TYPE_LONGLONG)
983
 
      table_field_type= DRIZZLE_TYPE_NEWDECIMAL;
 
983
      table_field_type= DRIZZLE_TYPE_DECIMAL;
984
984
    break;
985
985
  case ROW_RESULT:
986
986
  default:
1259
1259
                               0, name, table->s, &my_charset_bin);
1260
1260
  }
1261
1261
  else if (hybrid_type == DECIMAL_RESULT)
1262
 
    field= new Field_new_decimal(max_length, maybe_null, name,
1263
 
                                 decimals, unsigned_flag);
 
1262
    field= new Field_decimal(max_length, maybe_null, name,
 
1263
                             decimals, unsigned_flag);
1264
1264
  else
1265
1265
    field= new Field_double(max_length, maybe_null, name, decimals, true);
1266
1266
  if (field)