Merge branch 'mysql-5.5' into mysql-5.6

mithuncy · mithuncy · commit 32a2eb45b9a1 · 2015-10-12T12:59:42.000+05:30
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
@@ -541,7 +541,7 @@ MATCH(a) AGAINST('aaa1* aaa14 aaa15 aaa16' IN BOOLEAN MODE)
 DROP TABLE t1;
 CREATE TABLE t1(a TEXT);
 SELECT GROUP_CONCAT(a) AS st FROM t1 HAVING MATCH(st) AGAINST('test' IN BOOLEAN MODE);
-ERROR HY000: Incorrect arguments to AGAINST
+ERROR HY000: Incorrect arguments to MATCH
 DROP TABLE t1;
 CREATE TABLE t1(a VARCHAR(64), FULLTEXT(a));
 INSERT INTO t1 VALUES('awrd bwrd cwrd'),('awrd bwrd cwrd'),('awrd bwrd cwrd');
diff --git a/mysql-test/suite/innodb_fts/r/fulltext.result b/mysql-test/suite/innodb_fts/r/fulltext.result
@@ -498,7 +498,7 @@ MATCH(a) AGAINST('aaa1* aaa14 aaa15 aaa16' IN BOOLEAN MODE)
 DROP TABLE t1;
 CREATE TABLE t1(a TEXT) ENGINE = InnoDB;
 SELECT GROUP_CONCAT(a) AS st FROM t1 HAVING MATCH(st) AGAINST('test' IN BOOLEAN MODE);
-ERROR HY000: Incorrect arguments to AGAINST
+ERROR HY000: Incorrect arguments to MATCH
 DROP TABLE t1;
 CREATE TABLE t1(a VARCHAR(64), FULLTEXT(a)) ENGINE = InnoDB;
 INSERT INTO t1 VALUES('awrd bwrd cwrd'),('awrd bwrd cwrd'),('awrd bwrd cwrd');
diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -6247,12 +6247,12 @@ bool Item_func_match::fix_fields(THD *thd, Item **ref)
   const_item_cache=0;
   for (uint i=1 ; i < arg_count ; i++)
   {
-    item=args[i];
-    if (item->type() == Item::REF_ITEM)
-      args[i]= item= *((Item_ref *)item)->ref;
-    if (item->type() != Item::FIELD_ITEM)
+    item= args[i]= args[i]->real_item();
+    if (item->type() != Item::FIELD_ITEM ||
+        /* Cannot use FTS index with outer table field */
+        (item->used_tables() & OUTER_REF_TABLE_BIT))
     {
-      my_error(ER_WRONG_ARGUMENTS, MYF(0), "AGAINST");
+      my_error(ER_WRONG_ARGUMENTS, MYF(0), "MATCH");
       return TRUE;
     }
     allows_multi_table_search &= 

Original file line number	Diff line number	Diff line change
`@@ -6247,12 +6247,12 @@ bool Item_func_match::fix_fields(THD thd, Item *ref)`
`6247`	`6247`	`const_item_cache=0;`
`6248`	`6248`	`for (uint i=1 ; i < arg_count ; i++)`
`6249`	`6249`	`{`
`6250`		`- item=args[i];`
`6251`		`- if (item->type() == Item::REF_ITEM)`
`6252`		`- args[i]= item= ((Item_ref )item)->ref;`
`6253`		`- if (item->type() != Item::FIELD_ITEM)`
	`6250`	`+ item= args[i]= args[i]->real_item();`
	`6251`	`+ if (item->type() != Item::FIELD_ITEM \|\|`
	`6252`	`+ /* Cannot use FTS index with outer table field */`
	`6253`	`+ (item->used_tables() & OUTER_REF_TABLE_BIT))`
`6254`	`6254`	`{`
`6255`		`- my_error(ER_WRONG_ARGUMENTS, MYF(0), "AGAINST");`
	`6255`	`+ my_error(ER_WRONG_ARGUMENTS, MYF(0), "MATCH");`
`6256`	`6256`	`return TRUE;`
`6257`	`6257`	`}`
`6258`	`6258`	`allows_multi_table_search &=`