← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time_functions.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config 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/session.h>
27
 
#include <drizzled/time_functions.h>
28
 
#include <drizzled/charset.h>
29
 
#include <drizzled/system_variables.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"
30
29
 
31
 
namespace drizzled {
 
30
namespace drizzled
 
31
{
32
32
 
33
33
/* Some functions to calculate dates */
34
34
 
167
167
{
168
168
  char warn_buff[DRIZZLE_ERRMSG_SIZE];
169
169
  const char *type_str;
170
 
  charset_info_st *cs= &my_charset_utf8_general_ci;
 
170
  CHARSET_INFO *cs= &my_charset_utf8_general_ci;
171
171
  char buff[128];
172
172
  String str(buff,(uint32_t) sizeof(buff), system_charset_info);
173
173
  str.copy(str_val, str_length, system_charset_info);