← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/func.cc

  • Committer: Olaf van der Spek
  • Date: 2011-10-14 08:25:55 UTC
  • mfrom: (2433.1.6 rf1)
  • mto: This revision was merged to the branch mainline in revision 2438.
  • Revision ID: olafvdspek@gmail.com-20111014082555-6hacpwwm9i125r7g
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.cc
545
545
    return make_string_field(table);
546
546
 
547
547
  case DECIMAL_RESULT:
548
 
    field= new Field_decimal(class_decimal_precision_to_length(decimal_precision(),
549
 
                                                            decimals,
550
 
                                                            unsigned_flag),
551
 
                             maybe_null,
552
 
                             name,
553
 
                             decimals,
554
 
                             unsigned_flag);
 
548
    field= new Field_decimal(class_decimal_precision_to_length(decimal_precision(), decimals, unsigned_flag),
 
549
      maybe_null, name, decimals, unsigned_flag);
555
550
    break;
556
551
  case ROW_RESULT:
557
552
    // This case should never be chosen