← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/datetime.cc

Merged in remove-include-dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/datetime.cc
108
108
  if (error)
109
109
    set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
110
110
                         error == 2 ? ER_WARN_DATA_OUT_OF_RANGE :
111
 
                         WARN_DATA_TRUNCATED, initial_nr,
 
111
                         ER_WARN_DATA_TRUNCATED, initial_nr,
112
112
                         MYSQL_TIMESTAMP_DATETIME, 1);
113
113
 
114
114
#ifdef WORDS_BIGENDIAN
145
145
      char buff[MAX_DATE_STRING_REP_LENGTH];
146
146
      String str(buff, sizeof(buff), &my_charset_latin1);
147
147
      make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);
148
 
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
 
148
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED,
149
149
                           str.ptr(), str.length(), MYSQL_TIMESTAMP_DATETIME,1);
150
150
    }
151
151
  }
153
153
  {
154
154
    tmp=0;
155
155
    error= 1;
156
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
 
156
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
157
157
  }
158
158
#ifdef WORDS_BIGENDIAN
159
159
  if (table && table->s->db_low_byte_first)