← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/timestamp.cc

  • Committer: Monty
  • Date: 2008-10-02 16:32:09 UTC
  • Revision ID: mordred@scylla.inaugust.com-20081002163209-v5art4o6p51tl30s
Various int64 constant fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/timestamp.cc
214
214
  /* We don't want to store invalid or fuzzy datetime values in TIMESTAMP */
215
215
  int64_t tmp= number_to_datetime(nr, &l_time, (thd->variables.sql_mode &
216
216
                                                 MODE_NO_ZERO_DATE), &error);
217
 
  if (tmp == -1)
 
217
  if (tmp == INT64_C(-1))
218
218
  {
219
219
    error= 2;
220
220
  }
268
268
  
269
269
  thd->variables.time_zone->gmt_sec_to_TIME(&time_tmp, (my_time_t)temp);
270
270
  
271
 
  return time_tmp.year * 10000000000L + time_tmp.month * 100000000L +
272
 
         time_tmp.day * 1000000L + time_tmp.hour * 10000L +
 
271
  return time_tmp.year * INT64_C(10000000000) +
 
272
         time_tmp.month * INT64_C(100000000) +
 
273
         time_tmp.day * 1000000 + time_tmp.hour * 10000 +
273
274
         time_tmp.minute * 100 + time_tmp.second;
274
275
}
275
276