MDEV-8582: innodb_force_primary_key option does not force PK or unique key

Analysis: Handler table flag HA_REQUIRE_PRIMARY_KEY alone is not enough
to force primary or unique key, if table has at least one NOT NULL
column and secondary key for that column.

Fix: Add additional check that table really has primary key or
unique key for InnoDB terms.

mysql-test/suite/innodb/r/innodb_force_pk.result

@@ -51,3 +51,15 @@ show warnings;
 Level	Code	Message
 Error	1173	This table type requires a primary key
 drop table t1;
+create table t1 (i int not null, key(i)) engine=innodb;
+ERROR 42000: This table type requires a primary key
+create table t1 (i int not null, unique key(i)) engine=innodb;
+show warnings;
+Level	Code	Message
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `i` int(11) NOT NULL,
+  UNIQUE KEY `i` (`i`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+drop table t1;

mysql-test/suite/innodb/t/innodb_force_pk.test

@@ -33,6 +33,17 @@ create table t2(a integer) engine=innodb;
 show warnings;
 drop table t1;
 
+#
+# MDEV-8582: innodb_force_primary_key option does not
+# force PK or unique key
+#
+--error 1173
+create table t1 (i int not null, key(i)) engine=innodb;
+create table t1 (i int not null, unique key(i)) engine=innodb;
+show warnings;
+show create table t1;
+drop table t1;
+
 --disable_query_log
 eval set global innodb_force_primary_key=$force_pk;
 --enable_query_log

storage/innobase/handler/ha_innodb.cc

@@ -11134,6 +11134,11 @@ index_bad:
 		}
 	}
 
+	if (srv_force_primary_key && form->s->primary_key >= MAX_KEY) {
+		my_error(ER_REQUIRES_PRIMARY_KEY, MYF(0));
+		DBUG_RETURN(false);
+	}
+
 	row_format = form->s->row_type;
 
 	if (create_info->key_block_size) {

storage/xtradb/handler/ha_innodb.cc

@@ -11645,6 +11645,11 @@ index_bad:
 		}
 	}
 
+	if (srv_force_primary_key && form->s->primary_key >= MAX_KEY) {
+		my_error(ER_REQUIRES_PRIMARY_KEY, MYF(0));
+		DBUG_RETURN(false);
+	}
+
 	row_format = form->s->row_type;
 
 	if (create_info->key_block_size) {