← Back to branch summary

~percona-core/percona-server/5.5

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innobase/dict/dict0dict.c

  • Committer: Laurynas Biveinis
  • Date: 2013-09-06 13:24:59 UTC
  • mfrom: (558.8.3 5.5)
  • Revision ID: laurynas.biveinis@percona.com-20130906132459-jfaquw8dbwluzbsl
Merge lp:~akopytov/percona-server/ahi-fixes-5.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
Percona-Server/storage/innobase/dict/dict0dict.c
1972
1972
        zero. */
1973
1973
 
1974
1974
        for (;;) {
1975
 
                ulint ref_count = btr_search_info_get_ref_count(info, index->id);
 
1975
                ulint ref_count = btr_search_info_get_ref_count(info, index);
1976
1976
                if (ref_count == 0) {
1977
1977
                        break;
1978
1978
                }
2224
2224
        new_index->n_user_defined_cols = index->n_fields;
2225
2225
 
2226
2226
        new_index->id = index->id;
 
2227
        btr_search_index_init(new_index);
2227
2228
 
2228
2229
        /* Copy the fields of index */
2229
2230
        dict_index_copy(new_index, index, table, 0, index->n_fields);
2394
2395
        new_index->n_user_defined_cols = index->n_fields;
2395
2396
 
2396
2397
        new_index->id = index->id;
 
2398
        btr_search_index_init(new_index);
2397
2399
 
2398
2400
        /* Copy fields from index to new_index */
2399
2401
        dict_index_copy(new_index, index, table, 0, index->n_fields);