← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/hex_string.cc

  • Committer: Mark Atwood
  • Date: 2011-10-08 04:50:51 UTC
  • mfrom: (2430.1.1 rf)
  • Revision ID: me@mark.atwood.name-20111008045051-6ha1qiy7k2a9c3jv
Tags: 2011.10.27
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/hex_string.cc
40
40
                 X-'a'+10);
41
41
}
42
42
 
43
 
Item_hex_string::Item_hex_string(str_ref arg)
 
43
Item_hex_string::Item_hex_string(const char *str, uint32_t str_length)
44
44
{
45
 
  max_length= (arg.size() + 1) / 2;
 
45
  max_length=(str_length+1)/2;
46
46
  char *ptr=(char*) memory::sql_alloc(max_length+1);
47
47
  if (!ptr)
48
48
    return;
49
49
  str_value.set(ptr,max_length,&my_charset_bin);
50
 
  const char *str= arg.data();
51
50
  char *end=ptr+max_length;
52
 
  if (max_length * 2 != arg.size())
 
51
  if (max_length*2 != str_length)
53
52
    *ptr++=char_val(*str++);                    // Not even, assume 0 prefix
54
53
  while (ptr != end)
55
54
  {