~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/rpl_utility.cc

  • Committer: Brian Aker
  • Date: 2008-07-31 19:40:12 UTC
  • Revision ID: brian@tangent.org-20080731194012-oat11oy5vombrb1b
First pass of CHAR removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
45
45
  case DRIZZLE_TYPE_ENUM:
46
46
  case DRIZZLE_TYPE_STRING:
47
47
  {
48
 
    uchar type= m_field_metadata[col] >> 8U;
49
 
    if ((type == DRIZZLE_TYPE_SET) || (type == DRIZZLE_TYPE_ENUM))
50
 
      length= m_field_metadata[col] & 0x00ff;
51
 
    else
52
 
    {
53
 
      /*
54
 
        We are reading the actual size from the master_data record
55
 
        because this field has the actual lengh stored in the first
56
 
        byte.
57
 
      */
58
 
      length= (uint) *master_data + 1;
59
 
      assert(length != 0);
60
 
    }
 
48
    length= m_field_metadata[col] & 0x00ff;
61
49
    break;
62
50
  }
63
51
  case DRIZZLE_TYPE_TINY: