← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/field/timestamp.cc

  • Committer: Brian Aker
  • Date: 2008-07-22 18:31:32 UTC
  • Revision ID: brian@tangent.org-20080722183132-ne2ntl7g7mdf2eez
uint32 -> uin32_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/field/timestamp.cc
69
69
 */
70
70
 
71
71
Field_timestamp::Field_timestamp(uchar *ptr_arg,
72
 
                                 uint32 len_arg __attribute__((__unused__)),
 
72
                                 uint32_t len_arg __attribute__((__unused__)),
73
73
                                 uchar *null_ptr_arg, uchar null_bit_arg,
74
74
                                 enum utype unireg_check_arg,
75
75
                                 const char *field_name_arg,
251
251
 
252
252
int64_t Field_timestamp::val_int(void)
253
253
{
254
 
  uint32 temp;
 
254
  uint32_t temp;
255
255
  MYSQL_TIME time_tmp;
256
256
  THD  *thd= table ? table->in_use : current_thd;
257
257
 
276
276
 
277
277
String *Field_timestamp::val_str(String *val_buffer, String *val_ptr)
278
278
{
279
 
  uint32 temp, temp2;
 
279
  uint32_t temp, temp2;
280
280
  MYSQL_TIME time_tmp;
281
281
  THD *thd= table ? table->in_use : current_thd;
282
282
  char *to;
386
386
 
387
387
int Field_timestamp::cmp(const uchar *a_ptr, const uchar *b_ptr)
388
388
{
389
 
  int32 a,b;
 
389
  int32_t a,b;
390
390
#ifdef WORDS_BIGENDIAN
391
391
  if (table && table->s->db_low_byte_first)
392
392
  {
399
399
  longget(a,a_ptr);
400
400
  longget(b,b_ptr);
401
401
  }
402
 
  return ((uint32) a < (uint32) b) ? -1 : ((uint32) a > (uint32) b) ? 1 : 0;
 
402
  return ((uint32_t) a < (uint32_t) b) ? -1 : ((uint32_t) a > (uint32_t) b) ? 1 : 0;
403
403
}
404
404
 
405
405