← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/date.cc

Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/date.cc
132
132
      time_type == DRIZZLE_TIMESTAMP_DATETIME)
133
133
  {
134
134
    tmp= ltime->year*10000 + ltime->month*100 + ltime->day;
 
135
 
135
136
    if (check_date(ltime, tmp != 0,
136
137
                   (TIME_FUZZY_DATE |
137
138
                    (current_session->variables.sql_mode &
139
140
    {
140
141
      char buff[MAX_DATE_STRING_REP_LENGTH];
141
142
      String str(buff, sizeof(buff), &my_charset_utf8_general_ci);
142
 
      make_date(ltime, &str);
 
143
      ltime->convert(str, DRIZZLE_TIMESTAMP_DATE);
143
144
      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED,
144
145
                           str.ptr(), str.length(), DRIZZLE_TIMESTAMP_DATE, 1);
145
146
    }
146
 
    if (!error && ltime->time_type != DRIZZLE_TIMESTAMP_DATE &&
 
147
 
 
148
    if (not error && ltime->time_type != DRIZZLE_TIMESTAMP_DATE &&
147
149
        (ltime->hour || ltime->minute || ltime->second || ltime->second_part))
148
150
    {
149
151
      char buff[MAX_DATE_STRING_REP_LENGTH];
150
152
      String str(buff, sizeof(buff), &my_charset_utf8_general_ci);
151
 
      make_datetime(ltime, &str);
 
153
      ltime->convert(str);
152
154
      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_NOTE,
153
155
                           ER_WARN_DATA_TRUNCATED,
154
156
                           str.ptr(), str.length(), DRIZZLE_TIMESTAMP_DATE, 1);