← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzlebinlog.cc

  • Committer: Brian Aker
  • Date: 2008-07-31 19:57:34 UTC
  • mfrom: (236.1.27 codestyle)
  • Revision ID: brian@tangent.org-20080731195734-c7cu4gx70xgjr68o
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzlebinlog.cc
38
38
#include <libdrizzle/errmsg.h>
39
39
#include <mysys/my_getopt.h>
40
40
/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
41
 
#include "mysql_priv.h"
42
 
#include "log_event.h"
 
41
#include <drizzled/mysql_priv.h>
 
42
#include <drizzled/log_event.h>
43
43
#include <libdrizzle/sql_common.h>
44
44
 
45
45
 
1175
1175
static my_time_t convert_str_to_timestamp(const char* str)
1176
1176
{
1177
1177
  int was_cut;
1178
 
  MYSQL_TIME l_time;
 
1178
  DRIZZLE_TIME l_time;
1179
1179
  long dummy_my_timezone;
1180
1180
  bool dummy_in_dst_time_gap;
1181
1181
  /* We require a total specification (date AND time) */
1182
1182
  if (str_to_datetime(str, strlen(str), &l_time, 0, &was_cut) !=
1183
 
      MYSQL_TIMESTAMP_DATETIME || was_cut)
 
1183
      DRIZZLE_TIMESTAMP_DATETIME || was_cut)
1184
1184
  {
1185
1185
    error("Incorrect date and time argument: %s", str);
1186
1186
    exit(1);
1990
1990
  the server
1991
1991
*/
1992
1992
 
1993
 
#include "log_event.cc"
 
1993
#include <drizzled/log_event.cc>
1994
1994