← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal_interval.cc

  • Committer: Brian Aker
  • Date: 2011-01-19 18:03:32 UTC
  • mfrom: (2088.8.12 timestamp)
  • mto: This revision was merged to the branch mainline in revision 2098.
  • Revision ID: brian@tangent.org-20110119180332-acfk5i8oofp63s40
Merge in time code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/temporal_interval.cc
211
211
  case INTERVAL_DAY_MINUTE:
212
212
  case INTERVAL_DAY_HOUR:
213
213
    int64_t sec, days, daynr, microseconds, extra_sec;
214
 
    ltime->time_type= DRIZZLE_TIMESTAMP_DATETIME; // Return full date
 
214
    ltime->time_type= type::DRIZZLE_TIMESTAMP_DATETIME; // Return full date
215
215
    microseconds= ltime->second_part + sign*second_part;
216
216
    extra_sec= microseconds/1000000L;
217
217
    microseconds= microseconds%1000000L;
241
241
    /* Day number from year 0 to 9999-12-31 */
242
242
    if ((uint64_t) daynr > MAX_DAY_NUMBER)
243
243
      goto invalid_date;
244
 
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month,
245
 
        &ltime->day);
 
244
    get_date_from_daynr((long) daynr, &ltime->year, &ltime->month, &ltime->day);
246
245
    break;
247
246
  case INTERVAL_DAY:
248
247
  case INTERVAL_WEEK: