← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Mark Atwood
  • Date: 2011-10-14 15:59:08 UTC
  • mfrom: (2430.1.12 refactor3a)
  • Revision ID: me@mark.atwood.name-20111014155908-whqmrmaf2grpsg5c
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
1575
1575
    */
1576
1576
    if (item->unsigned_flag)
1577
1577
    {
1578
 
      new_field= new field::Size(item->max_length, maybe_null,
1579
 
                                  item->name, item->unsigned_flag);
 
1578
      new_field= new field::Size(item->max_length, maybe_null, item->name, item->unsigned_flag);
1580
1579
    }
1581
 
    else if (item->max_length >= (MY_INT32_NUM_DECIMAL_DIGITS - 1))
 
1580
    else if (item->max_length >= MY_INT32_NUM_DECIMAL_DIGITS - 1)
1582
1581
    {
1583
 
      new_field= new field::Int64(item->max_length, maybe_null,
1584
 
                                  item->name, item->unsigned_flag);
 
1582
      new_field= new field::Int64(item->max_length, maybe_null, item->name, item->unsigned_flag);
1585
1583
    }
1586
1584
    else
1587
1585
    {
1588
 
      new_field= new field::Int32(item->max_length, maybe_null,
1589
 
                                  item->name, item->unsigned_flag);
 
1586
      new_field= new field::Int32(item->max_length, maybe_null, item->name, item->unsigned_flag);
1590
1587
    }
1591
1588
 
1592
1589
    break;