← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time_functions.cc

  • Committer: Brian Aker
  • Date: 2011-01-25 07:22:15 UTC
  • mfrom: (2109.1.7 drizzle-build)
  • Revision ID: brian@tangent.org-20110125072215-567z6uzy5vdvn4va
Merge in build/timestamp patches/fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time_functions.cc
129
129
                                            type::Time *l_time,
130
130
                                            uint32_t flags)
131
131
{
132
 
  int was_cut;
 
132
  type::cut_t was_cut= type::VALID;
133
133
  type::timestamp_t ts_type;
134
134
  Session *session= current_session;
135
135
 
136
 
  ts_type= str_to_datetime(str, length, l_time,
137
 
                           (flags | (session->variables.sql_mode &
138
 
                                     (MODE_INVALID_DATES |
139
 
                                      MODE_NO_ZERO_DATE))),
140
 
                           &was_cut);
 
136
  ts_type= l_time->store(str, length,
 
137
                         (flags | (session->variables.sql_mode &
 
138
                                   (MODE_INVALID_DATES |
 
139
                                    MODE_NO_ZERO_DATE))),
 
140
                         was_cut);
141
141
  if (was_cut || ts_type <= type::DRIZZLE_TIMESTAMP_ERROR)
142
142
    make_truncated_value_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
143
143
                                 str, length, ts_type,  NULL);
 
144
 
144
145
  return ts_type;
145
146
}
146
147
 
149
150
str_to_time_with_warn(const char *str, uint32_t length, type::Time *l_time)
150
151
{
151
152
  int warning;
152
 
  bool ret_val= str_to_time(str, length, l_time, &warning);
 
153
  bool ret_val= l_time->store(str, length, warning, type::DRIZZLE_TIMESTAMP_TIME);
153
154
  if (ret_val || warning)
154
155
    make_truncated_value_warning(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
155
156
                                 str, length, type::DRIZZLE_TIMESTAMP_TIME, NULL);