  alter table t1 add unique index (c), add index (d);
  show create table t1;
  explain select * from t1 force index(c) order by c;
- --error ER_REQUIRES_PRIMARY_KEY
- drop index c on t1;
  alter table t1 add primary key (a), drop index c;
+ show create table t1;
+ --error ER_MULTIPLE_PRI_KEY

   `b` int(11) DEFAULT NULL,
Index: storage/innobase/mysql-test/innodb-index.test
===================================================================
--- storage/innobase/mysql-test/innodb-index.test	(revision 2229)
+++ storage/innobase/mysql-test/innodb-index.test	(working copy)
@@ -14,22 +14,12 @@ select * from t1 force index (d2) order 
 --error ER_DUP_ENTRY


Index: storage/innobase/mysql-test/innodb-index.result
===================================================================
--- storage/innobase/mysql-test/innodb-index.result	(revision 2870)
+++ storage/innobase/mysql-test/innodb-index.result	(working copy)
@@ -43,19 +43,12 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
