← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time_functions.h

  • Committer: Andrew Hutchings
  • Date: 2011-01-28 21:33:48 UTC
  • mto: (2126.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2127.
  • Revision ID: andrew@linuxjedi.co.uk-20110128213348-ypi381xo47o80ypo
https://launchpad.net/bugs/709493
Backport fix for http://bugs.mysql.com/bug.php?id=57034

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time_functions.h
20
20
#ifndef DRIZZLED_TIME_FUNCTIONS_H
21
21
#define DRIZZLED_TIME_FUNCTIONS_H
22
22
 
23
 
#include <drizzled/sql_error.h>
24
 
#include <drizzled/type/time.h>
 
23
#include "drizzled/sql_error.h"
 
24
#include "drizzled/type/time.h"
25
25
 
26
26
namespace drizzled
27
27
{
86
86
  NOTE
87
87
    See str_to_time() for more info.
88
88
*/
89
 
bool str_to_time_with_warn(Session *session, const char *str, uint32_t length, type::Time *l_time);
 
89
bool str_to_time_with_warn(const char *str, uint32_t length, type::Time *l_time);
90
90
 
91
91
void make_truncated_value_warning(Session *session, 
92
92
                                  DRIZZLE_ERROR::enum_warning_level level,