← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/date.cc

  • Committer: Monty Taylor
  • Date: 2008-09-13 20:24:20 UTC
  • mfrom: (383.1.35 drizzle)
  • Revision ID: monty@inaugust.com-20080913202420-lkj76ewbabl8ljvp
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/date.cc
149
149
                     (MODE_NO_ZERO_DATE | MODE_INVALID_DATES))), &error))
150
150
    {
151
151
      char buff[MAX_DATE_STRING_REP_LENGTH];
152
 
      String str(buff, sizeof(buff), &my_charset_latin1);
 
152
      String str(buff, sizeof(buff), &my_charset_utf8_general_ci);
153
153
      make_date((DATE_TIME_FORMAT *) 0, ltime, &str);
154
154
      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED,
155
155
                           str.ptr(), str.length(), DRIZZLE_TIMESTAMP_DATE, 1);
158
158
        (ltime->hour || ltime->minute || ltime->second || ltime->second_part))
159
159
    {
160
160
      char buff[MAX_DATE_STRING_REP_LENGTH];
161
 
      String str(buff, sizeof(buff), &my_charset_latin1);
 
161
      String str(buff, sizeof(buff), &my_charset_utf8_general_ci);
162
162
      make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);
163
163
      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_NOTE,
164
164
                           ER_WARN_DATA_TRUNCATED,