- Commiting merge files

2 files changed, 15 insertions, 5 deletions

diff --git a/mysql-test/suite/innodb_fts/r/fulltext.result b/mysql-test/suite/innodb_fts/r/fulltext.result
index e665fd1370f..dd8412c6651 100644
--- a/mysql-test/suite/innodb_fts/r/fulltext.result
+++ b/mysql-test/suite/innodb_fts/r/fulltext.result
@@ -549,8 +549,8 @@ WHERE t3.a=t1.a AND MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE)
 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-2	DEPENDENT SUBQUERY	t2	fulltext	b2	b2	0		1	Using where
-2	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	Using where
+2	MATERIALIZED	t2	fulltext	b2	b2	0		1	Using where
+2	MATERIALIZED	t3	ALL	NULL	NULL	NULL	NULL	2	Using where
 # should return 0
 SELECT count(*) FROM t1 WHERE 
 not exists(
@@ -558,7 +558,7 @@ SELECT 1 FROM t2, t3
 WHERE t3.a=t1.a AND MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE)
 );
 count(*)
-1
+0
 SELECT count(*) FROM t1 WHERE 
 not exists(
 SELECT 1 FROM t2 IGNORE INDEX (b2), t3
diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result b/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
index 0f50d6943a8..9f5c1f271fc 100644
--- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
+++ b/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result
@@ -44,6 +44,7 @@ id2
 3
 SELECT id1 FROM t1 WHERE MATCH (a1,b1) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN BOOLEAN MODE) ;
 id1
+1
 3
 6
 2
@@ -51,6 +52,7 @@ id1
 5
 SELECT id2 FROM t2 WHERE MATCH (a2,b2) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN BOOLEAN MODE) ;
 id2
+1
 3
 6
 2
@@ -89,12 +91,14 @@ SELECT id1 FROM t1 WHERE MATCH (a1,b1) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN
 id1
 SELECT id2 FROM t2 WHERE MATCH (a2,b2) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN BOOLEAN MODE) ;
 id2
+3
 6
 SELECT id1 FROM t1 WHERE MATCH (a1,b1) AGAINST ('+update +cascade' IN BOOLEAN MODE) ;
 id1
 4
 2
 6
+1
 5
 3
 SELECT id2 FROM t2 WHERE MATCH (a2,b2) AGAINST ('+update +cascade' IN BOOLEAN MODE) ;
@@ -102,10 +106,12 @@ id2
 4
 2
 6
+1
 5
 3
 SELECT id2 FROM t2 WHERE a2 LIKE '%UPDATE CASCADE%';
 id2
+1
 2
 3
 4
@@ -212,10 +218,8 @@ SELECT * FROM t2 WHERE MATCH (a2,b2) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN B
 id2	a2	b2
 SELECT * FROM t1 WHERE a1 LIKE '%tutorial%';
 id1	a1	b1
-1	MySQL Tutorial	DBMS stands for DataBase VÐƷWİ...
 SELECT * FROM t2 WHERE a2 LIKE '%tutorial%';
 id2	a2	b2
-1	MySQL Tutorial	DBMS stands for DataBase VÐƷWİ...
 DROP TABLE t2 , t1;
 DROP TABLE IF EXISTS t2,t1;
 SET NAMES utf8;
@@ -265,10 +269,12 @@ id2	a2	b2
 SELECT * FROM t1 WHERE MATCH (a1,b1) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN BOOLEAN MODE) ;
 id1	a1	b1
 3	Optimizing MySQL	In this tutorial we will show ...
+1	MySQL Tutorial	DBMS stands for DataBase VÐƷWİ...
 2	How To Use MySQL Well	After you went through a ...
 SELECT * FROM t2 WHERE MATCH (a2,b2) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN BOOLEAN MODE) ;
 id2	a2	b2
 3	Optimizing MySQL	In this tutorial we will show ...
+1	MySQL Tutorial	DBMS stands for DataBase VÐƷWİ...
 2	How To Use MySQL Well	After you went through a ...
 SELECT * FROM t1 WHERE MATCH (a1,b1) AGAINST ('tutorial' WITH QUERY EXPANSION) ;
 id1	a1	b1
@@ -327,12 +333,14 @@ SELECT * FROM t1 WHERE MATCH (a1,b1) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN B
 id1	a1	b1
 SELECT * FROM t2 WHERE MATCH (a2,b2) AGAINST ('tutorial (+mysql -VÐƷWİ)' IN BOOLEAN MODE) ;
 id2	a2	b2
+3	changing column - on UPDATE cascade	In this tutorial we will show ...
 6	changing column - on UPDATE cascade	When configured properly, MySQL ...
 SELECT * FROM t1 WHERE MATCH (a1,b1) AGAINST ('+UPDATE +cascade' IN BOOLEAN MODE) ;
 id1	a1	b1
 4	changing column - on UPDATE cascade	to check foreign constraint
 2	changing column - on UPDATE cascade	to check foreign constraint
 6	changing column - on UPDATE cascade	to check foreign constraint
+1	changing column - on UPDATE cascade	to check foreign constraint
 5	changing column - on UPDATE cascade	to check foreign constraint
 3	changing column - on UPDATE cascade	to check foreign constraint
 SELECT * FROM t2 WHERE MATCH (a2,b2) AGAINST ('+UPDATE +cascade' IN BOOLEAN MODE) ;
@@ -340,10 +348,12 @@ id2	a2	b2
 4	changing column - on UPDATE cascade	1. Never run mysqld as root. 2. ...
 2	changing column - on UPDATE cascade	After you went through a ...
 6	changing column - on UPDATE cascade	When configured properly, MySQL ...
+1	changing column - on UPDATE cascade	DBMS stands for DataBase VÐƷWİ...
 5	changing column - on UPDATE cascade	In the following database comparison ...
 3	changing column - on UPDATE cascade	In this tutorial we will show ...
 SELECT * FROM t2 WHERE a2 LIKE '%UPDATE CASCADE%';
 id2	a2	b2
+1	changing column - on UPDATE cascade	DBMS stands for DataBase VÐƷWİ...
 2	changing column - on UPDATE cascade	After you went through a ...
 3	changing column - on UPDATE cascade	In this tutorial we will show ...
 4	changing column - on UPDATE cascade	1. Never run mysqld as root. 2. ...