← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/handler0alter.cc

Merge initial InnoDB+ import.

This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e

Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.

This takes us to InnoDB 1.1.1(ish).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/handler0alter.cc
913
913
                trx_commit_for_mysql(prebuilt->trx);
914
914
        }
915
915
 
 
916
        ut_d(dict_table_check_for_dup_indexes(innodb_table, FALSE));
 
917
 
916
918
        if (dict_locked) {
917
 
                ut_d(dict_table_check_for_dup_indexes(innodb_table, FALSE));
918
919
                row_mysql_unlock_data_dictionary(trx);
919
920
        }
920
921