← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/table.cc

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/table.cc
1129
1129
    reg_field->flags|= ((uint)column_format << COLUMN_FORMAT_FLAGS);
1130
1130
    reg_field->field_index= i;
1131
1131
    reg_field->comment=comment;
1132
 
    if (field_type == MYSQL_TYPE_BIT && !f_bit_as_char(pack_flag))
1133
 
    {
1134
 
      if ((null_bit_pos+= field_length & 7) > 7)
1135
 
      {
1136
 
        null_pos++;
1137
 
        null_bit_pos-= 8;
1138
 
      }
1139
 
    }
1140
1132
    if (!(reg_field->flags & NOT_NULL_FLAG))
1141
1133
    {
1142
1134
      if (!(null_bit_pos= (null_bit_pos + 1) & 7))
1226
1218
          keyinfo->extra_length+=HA_KEY_BLOB_LENGTH;
1227
1219
          key_part->store_length+=HA_KEY_BLOB_LENGTH;
1228
1220
          keyinfo->key_length+= HA_KEY_BLOB_LENGTH;
1229
 
          /*
1230
 
            Mark that there may be many matching values for one key
1231
 
            combination ('a', 'a ', 'a  '...)
1232
 
          */
1233
 
          if (!(field->flags & BINARY_FLAG))
1234
 
            keyinfo->flags|= HA_END_SPACE_KEY;
1235
1221
        }
1236
 
        if (field->type() == MYSQL_TYPE_BIT)
1237
 
          key_part->key_part_flag|= HA_BIT_PART;
1238
 
 
1239
1222
        if (i == 0 && key != primary_key)
1240
1223
          field->flags |= (((keyinfo->flags & HA_NOSAME) &&
1241
1224
                           (keyinfo->key_parts == 1)) ?