← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

A number of dead code removal patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1125
1125
      set_if_bigger(share->max_key_length,keyinfo->key_length+
1126
1126
                    keyinfo->key_parts);
1127
1127
      share->total_key_length+= keyinfo->key_length;
1128
 
      /*
1129
 
        MERGE tables do not have unique indexes. But every key could be
1130
 
        an unique index on the underlying MyISAM table. (Bug #10400)
1131
 
      */
1132
 
      if ((keyinfo->flags & HA_NOSAME) ||
1133
 
          (handler_file->getEngine()->check_flag(HTON_BIT_ANY_INDEX_MAY_BE_UNIQUE)))
 
1128
 
 
1129
      if (keyinfo->flags & HA_NOSAME)
 
1130
      {
1134
1131
        set_if_bigger(share->max_unique_length,keyinfo->key_length);
 
1132
      }
1135
1133
    }
1136
1134
    if (primary_key < MAX_KEY &&
1137
1135
        (share->keys_in_use.test(primary_key)))