← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzlebinlog.cc

  • Committer: Monty Taylor
  • Date: 2008-07-31 18:25:59 UTC
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: monty@inaugust.com-20080731182559-txjt9f3dfhusxfp8
Renamed MYSQL_TIME to DRIZZLE_TIME.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzlebinlog.cc
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);