← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Monty Taylor
  • Date: 2009-04-09 05:35:58 UTC
  • mfrom: (984 merge)
  • mto: (992.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 986.
  • Revision ID: mordred@inaugust.com-20090409053558-qi1x0zzsgf1d8f1p
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
1598
1598
    int64_t nr;
1599
1599
    nr= val_int();
1600
1600
    if (!null_value)
1601
 
      result= protocol->store_long(nr);
 
1601
      result= protocol->store((int32_t)nr);
1602
1602
    break;
1603
1603
  }
1604
1604
  case DRIZZLE_TYPE_LONGLONG:
1606
1606
    int64_t nr;
1607
1607
    nr= val_int();
1608
1608
    if (!null_value)
1609
 
      result= protocol->store_int64_t(nr, unsigned_flag);
 
1609
    {
 
1610
      if (unsigned_flag)
 
1611
        result= protocol->store((uint64_t)nr);
 
1612
      else
 
1613
        result= protocol->store((int64_t)nr);
 
1614
    }
1610
1615
    break;
1611
1616
  }
1612
1617
  case DRIZZLE_TYPE_DOUBLE:
1622
1627
    DRIZZLE_TIME tm;
1623
1628
    get_date(&tm, TIME_FUZZY_DATE);
1624
1629
    if (!null_value)
1625
 
    {
1626
 
      if (f_type == DRIZZLE_TYPE_DATE)
1627
 
        return protocol->store_date(&tm);
1628
 
      else
1629
 
        result= protocol->store(&tm);
1630
 
    }
 
1630
      result= protocol->store(&tm);
1631
1631
    break;
1632
1632
  }
1633
1633
  }
1634
1634
  if (null_value)
1635
 
    result= protocol->store_null();
 
1635
    result= protocol->store();
1636
1636
  return result;
1637
1637
}
1638
1638