diff --git a/mysql-test/main/innodb_ext_key,off.rdiff b/mysql-test/main/innodb_ext_key,off.rdiff
index 4d6c65c9971..8061d87990b 100644
--- a/mysql-test/main/innodb_ext_key,off.rdiff
+++ b/mysql-test/main/innodb_ext_key,off.rdiff
@@ -1,5 +1,5 @@
---- innodb_ext_key.result
-+++ innodb_ext_key,off.result
+--- main/innodb_ext_key.result
++++ main/innodb_ext_key,off.reject
 @@ -9,7 +9,7 @@
  explain
  select count(*) from lineitem where l_orderkey=130 and l_shipdate='1992-07-01';
@@ -230,14 +230,14 @@
  Handler_read_retry	0
  Handler_read_rnd	0
 @@ -314,8 +314,8 @@
- select * from t0, part ignore index (primary)
+ select straight_join * from t0, part ignore index (primary)
  where p_partkey=t0.a and p_size=1;
  id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 -1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	5	Using where
 -1	SIMPLE	part	eq_ref	i_p_size	i_p_size	9	const,dbt3_s001.t0.a	1	
 +1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	5	
 +1	SIMPLE	part	ref	i_p_size	i_p_size	5	const	5	Using index condition
- select * from t0,  part ignore index (primary)
+ select straight_join * from t0,  part ignore index (primary)
  where p_partkey=t0.a and p_size=1;
  a	p_partkey	p_name	p_mfgr	p_brand	p_type	p_size	p_container	p_retailprice	p_comment
 @@ -494,7 +494,7 @@
diff --git a/mysql-test/main/innodb_ext_key.result b/mysql-test/main/innodb_ext_key.result
index 0d3e27e5bf0..6d5c1885110 100644
--- a/mysql-test/main/innodb_ext_key.result
+++ b/mysql-test/main/innodb_ext_key.result
@@ -311,12 +311,12 @@ create table t0 (a int);
 insert into t0 values (1), (2), (3), (4), (5);
 create index i_p_size on part(p_size);
 explain
-select * from t0, part ignore index (primary)
+select straight_join * from t0, part ignore index (primary)
 where p_partkey=t0.a and p_size=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	5	Using where
 1	SIMPLE	part	eq_ref	i_p_size	i_p_size	9	const,dbt3_s001.t0.a	1	
-select * from t0,  part ignore index (primary)
+select straight_join * from t0,  part ignore index (primary)
 where p_partkey=t0.a and p_size=1;
 a	p_partkey	p_name	p_mfgr	p_brand	p_type	p_size	p_container	p_retailprice	p_comment
 2	2	blush rosy metallic lemon navajo	Manufacturer#1	Brand#13	LARGE BRUSHED BRASS	1	LG CASE	902	final platelets hang f
diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test
index 8ed3b6ac734..3c646608273 100644
--- a/mysql-test/main/innodb_ext_key.test
+++ b/mysql-test/main/innodb_ext_key.test
@@ -162,10 +162,10 @@ insert into t0 values (1), (2), (3), (4), (5);
 create index i_p_size on part(p_size);
 
 explain
-select * from t0, part ignore index (primary)
+select straight_join * from t0, part ignore index (primary)
   where p_partkey=t0.a and p_size=1;
 
-select * from t0,  part ignore index (primary)
+select straight_join * from t0,  part ignore index (primary)
   where p_partkey=t0.a and p_size=1;
 
 drop table t0;