Merge Revision revid:marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq from MySQL InnoDB
Original revid:marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq
Original Authors: Marko Mäkelä <marko.makela@oracle.com>
Original commit message:
ha_innobase::add_index(): Only check for duplicate indexes
when the data dictionary is locked.
This fixes a UNIV_DEBUG assertion failure in innodb-index.test.