← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/hex_string.cc

  • Committer: Stewart Smith
  • Date: 2010-07-27 19:43:43 UTC
  • mto: (1720.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1721.
  • Revision ID: stewart@flamingspork.com-20100727194343-rj79lftdvityzqlg
fix SHOW CREATE TABLE tests for explicit COLLATE in CREATE TABLE

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/hex_string.cc
66
66
  // following assert is redundant, because fixed=1 assigned in constructor
67
67
  assert(fixed == 1);
68
68
  char *end= (char*) str_value.ptr()+str_value.length(),
69
 
       *ptr= end - min(str_value.length(), sizeof(int64_t));
 
69
       *ptr= end - min(str_value.length(),(uint32_t)sizeof(int64_t));
70
70
 
71
71
  uint64_t value=0;
72
72
  for (; ptr != end ; ptr++)
116
116
void Item_hex_string::print(String *str, enum_query_type)
117
117
{
118
118
  char *end= (char*) str_value.ptr() + str_value.length(),
119
 
       *ptr= end - min(str_value.length(), sizeof(int64_t));
 
119
       *ptr= end - min(str_value.length(), (uint32_t)sizeof(int64_t));
120
120
  str->append("0x");
121
121
  for (; ptr != end ; ptr++)
122
122
  {