← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/timestamp.cc

Merged in remove-include-dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/timestamp.cc
158
158
  if (error || !have_smth_to_conv)
159
159
  {
160
160
    error= 1;
161
 
    set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
 
161
    set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED,
162
162
                         from, len, MYSQL_TIMESTAMP_DATETIME, 1);
163
163
  }
164
164
 
237
237
    }
238
238
  } else if (error)
239
239
    set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
240
 
                         WARN_DATA_TRUNCATED,
 
240
                         ER_WARN_DATA_TRUNCATED,
241
241
                         nr, MYSQL_TIMESTAMP_DATETIME, 1);
242
242
 
243
243
  store_timestamp(timestamp);