← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/table.cc

  • Committer: Patrick Galbraith
  • Date: 2008-07-28 01:47:41 UTC
  • mto: (212.1.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 217.
  • Revision ID: patg@ishvara-20080728014741-yoasv5trt1ef9rha
Renamed FIELD_TYPE to DRIZZLE_TYPE

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/table.cc
971
971
    }
972
972
    
973
973
#ifndef TO_BE_DELETED_ON_PRODUCTION
974
 
    if (field_type == FIELD_TYPE_NEWDECIMAL && !share->mysql_version)
 
974
    if (field_type == DRIZZLE_TYPE_NEWDECIMAL && !share->mysql_version)
975
975
    {
976
976
      /*
977
977
        Fix pack length of old decimal values from 5.0.3 -> 5.0.4
1097
1097
          keyinfo->extra_length+= HA_KEY_NULL_LENGTH;
1098
1098
          keyinfo->key_length+= HA_KEY_NULL_LENGTH;
1099
1099
        }
1100
 
        if (field->type() == FIELD_TYPE_BLOB ||
1101
 
            field->real_type() == FIELD_TYPE_VARCHAR)
 
1100
        if (field->type() == DRIZZLE_TYPE_BLOB ||
 
1101
            field->real_type() == DRIZZLE_TYPE_VARCHAR)
1102
1102
        {
1103
 
          if (field->type() == FIELD_TYPE_BLOB)
 
1103
          if (field->type() == DRIZZLE_TYPE_BLOB)
1104
1104
            key_part->key_part_flag|= HA_BLOB_PART;
1105
1105
          else
1106
1106
            key_part->key_part_flag|= HA_VAR_LENGTH_PART;
1147
1147
        if (field->key_length() != key_part->length)
1148
1148
        {
1149
1149
#ifndef TO_BE_DELETED_ON_PRODUCTION
1150
 
          if (field->type() == FIELD_TYPE_NEWDECIMAL)
 
1150
          if (field->type() == DRIZZLE_TYPE_NEWDECIMAL)
1151
1151
          {
1152
1152
            /*
1153
1153
              Fix a fatal error in decimal key handling that causes crashes