← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time_functions.cc

Merge in additional test case fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time_functions.cc
20
20
 
21
21
/* Functions to handle date and time */
22
22
 
23
 
#include <config.h>
24
 
#include <drizzled/error.h>
25
 
#include <drizzled/util/test.h>
26
 
#include <drizzled/tztime.h>
27
 
#include <drizzled/session.h>
28
 
#include <drizzled/time_functions.h>
 
23
#include "config.h"
 
24
#include "drizzled/error.h"
 
25
#include "drizzled/util/test.h"
 
26
#include "drizzled/tztime.h"
 
27
#include "drizzled/session.h"
 
28
#include "drizzled/time_functions.h"
29
29
 
30
30
namespace drizzled
31
31
{
147
147
 
148
148
 
149
149
bool
150
 
str_to_time_with_warn(Session *session, const char *str, uint32_t length, type::Time *l_time)
 
150
str_to_time_with_warn(const char *str, uint32_t length, type::Time *l_time)
151
151
{
152
152
  int warning;
153
153
  bool ret_val= l_time->store(str, length, warning, type::DRIZZLE_TIMESTAMP_TIME);
154
154
  if (ret_val || warning)
155
 
    make_truncated_value_warning(session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
155
    make_truncated_value_warning(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
156
156
                                 str, length, type::DRIZZLE_TIMESTAMP_TIME, NULL);
157
157
  return ret_val;
158
158
}