renamed join_types (as was suggested by Peter Gulutzan)

1 files changed, 5 insertions, 5 deletions

diff --git a/mysql-test/r/subselect2.result b/mysql-test/r/subselect2.result
index c387d8b2d76..98df44553d2 100644
--- a/mysql-test/r/subselect2.result
+++ b/mysql-test/r/subselect2.result
@@ -123,9 +123,9 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	system	PRIMARY	NULL	NULL	NULL	0	const row not found
 1	PRIMARY	t2	ALL	DDOCTYPEID_IDX	NULL	NULL	NULL	9	Using where
 1	PRIMARY	t4	eq_ref	PRIMARY	PRIMARY	32	test.t2.DOCTYPEID	1	
-2	DEPENDENT SUBQUERY	t3	simple_in	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
-3	DEPENDENT SUBQUERY	t3	simple_in	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
-4	DEPENDENT SUBQUERY	t3	simple_in	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
-5	DEPENDENT SUBQUERY	t3	simple_in	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
-6	DEPENDENT SUBQUERY	t3	simple_in	PRIMARY,FFOLDERID_IDX,CMFLDRPARNT_IDX	PRIMARY	32	func	1	Using index; Using where
+2	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
+3	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
+4	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
+5	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX	PRIMARY	32	func	1	Using index; Using where
+6	DEPENDENT SUBQUERY	t3	unique_subquery	PRIMARY,FFOLDERID_IDX,CMFLDRPARNT_IDX	PRIMARY	32	func	1	Using index; Using where
 drop table t1, t2, t3, t4;