← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time_functions.cc

Reverted changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time_functions.cc
131
131
                          uint32_t flags)
132
132
{
133
133
  int was_cut;
 
134
  enum enum_drizzle_timestamp_type ts_type;
134
135
  Session *session= current_session;
135
 
  enum enum_drizzle_timestamp_type ts_type;
136
136
 
137
137
  ts_type= str_to_datetime(str, length, l_time,
138
138
                           (flags | (session->variables.sql_mode &
140
140
                                      MODE_NO_ZERO_DATE))),
141
141
                           &was_cut);
142
142
  if (was_cut || ts_type <= DRIZZLE_TIMESTAMP_ERROR)
143
 
    make_truncated_value_warning(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
143
    make_truncated_value_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
144
144
                                 str, length, ts_type,  NULL);
145
145
  return ts_type;
146
146
}