← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/timestamp.cc

Merged from Toru - removal of my_time_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/timestamp.cc
152
152
                           const CHARSET_INFO * const cs __attribute__((unused)))
153
153
{
154
154
  DRIZZLE_TIME l_time;
155
 
  my_time_t tmp= 0;
 
155
  time_t tmp= 0;
156
156
  int error;
157
157
  bool have_smth_to_conv;
158
158
  bool in_dst_time_gap;
212
212
                           bool unsigned_val __attribute__((unused)))
213
213
{
214
214
  DRIZZLE_TIME l_time;
215
 
  my_time_t timestamp= 0;
 
215
  time_t timestamp= 0;
216
216
  int error;
217
217
  bool in_dst_time_gap;
218
218
  Session *session= table ? table->in_use : current_session;
466
466
}
467
467
 
468
468
 
469
 
void Field_timestamp::store_timestamp(my_time_t timestamp)
 
469
void Field_timestamp::store_timestamp(time_t timestamp)
470
470
{
471
471
#ifdef WORDS_BIGENDIAN
472
472
  if (table && table->s->db_low_byte_first)