← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/datetime.cc

  • Committer: Brian Aker
  • Date: 2011-01-17 16:48:48 UTC
  • mto: (2097.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2098.
  • Revision ID: brian@tangent.org-20110117164848-x0gl1pvamks5si07
Merge in namespace of enum.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/datetime.cc
121
121
  return 0;
122
122
}
123
123
 
124
 
int Field_datetime::store_time(type::Time *ltime, enum enum_drizzle_timestamp_type)
 
124
int Field_datetime::store_time(type::Time *ltime, type::timestamp_t)
125
125
{
126
126
  DateTime temporal;
127
127
 
223
223
  part1=(uint32_t) (tmp/INT64_C(1000000));
224
224
  part2=(uint32_t) (tmp - (uint64_t) part1*INT64_C(1000000));
225
225
 
226
 
  ltime->time_type=     DRIZZLE_TIMESTAMP_DATETIME;
 
226
  ltime->time_type=     type::DRIZZLE_TIMESTAMP_DATETIME;
227
227
  ltime->neg=           0;
228
228
  ltime->second_part=   0;
229
229
  ltime->second=        (int) (part2%100);