← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/time.cc

  • Committer: Stewart Smith
  • Date: 2011-01-21 01:09:12 UTC
  • mfrom: (2099 staging)
  • mto: (2099.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2100.
  • Revision ID: stewart@flamingspork.com-20110121010912-x5ogi8rm08nortxp
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/time.cc
101
101
  { 
102
102
    tmp= TIME_MAX_VALUE;
103
103
    set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
104
 
                         ER_WARN_DATA_OUT_OF_RANGE, from, DRIZZLE_TIMESTAMP_TIME);
 
104
                         ER_WARN_DATA_OUT_OF_RANGE, from, type::DRIZZLE_TIMESTAMP_TIME);
105
105
    error= 1;
106
106
  }
107
107
  else if (from < (double) - TIME_MAX_VALUE)
108
108
  { 
109
109
    tmp= -TIME_MAX_VALUE;
110
110
    set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
111
 
                         ER_WARN_DATA_OUT_OF_RANGE, from, DRIZZLE_TIMESTAMP_TIME);
 
111
                         ER_WARN_DATA_OUT_OF_RANGE, from, type::DRIZZLE_TIMESTAMP_TIME);
112
112
    error= 1;
113
113
  }
114
114
  else
123
123
      tmp=0;
124
124
      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
125
125
                           ER_WARN_DATA_OUT_OF_RANGE, from,
126
 
                           DRIZZLE_TIMESTAMP_TIME);
 
126
                           type::DRIZZLE_TIMESTAMP_TIME);
127
127
      error= 1;
128
128
    }
129
129
  }
227
227
  drizzled::Time temporal;
228
228
  unpack_time(temporal);
229
229
 
230
 
  ltime->time_type= DRIZZLE_TIMESTAMP_DATETIME;
 
230
  ltime->time_type= type::DRIZZLE_TIMESTAMP_DATETIME;
231
231
  ltime->year= temporal.years();
232
232
  ltime->month= temporal.months();
233
233
  ltime->day= temporal.days();