← 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-26 06:48:39 UTC
  • mfrom: (2114.5.2 timestamp)
  • Revision ID: brian@tangent.org-20110126064839-nfcmqoqu08x22pdo
Merge in time tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time_functions.cc
124
124
}
125
125
 
126
126
 
127
 
type::timestamp_t str_to_datetime_with_warn(const char *str, 
 
127
type::timestamp_t str_to_datetime_with_warn(Session *session,
 
128
                                            const char *str, 
128
129
                                            uint32_t length, 
129
130
                                            type::Time *l_time,
130
131
                                            uint32_t flags)
131
132
{
132
133
  type::cut_t was_cut= type::VALID;
133
134
  type::timestamp_t ts_type;
134
 
  Session *session= current_session;
135
135
 
136
136
  ts_type= l_time->store(str, length,
137
137
                         (flags | (session->variables.sql_mode &