Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 11 insertions, 35 deletions

diff --git a/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test b/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test
index 84254a18..bf20c939 100644
--- a/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test
+++ b/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test
@@ -32,7 +32,7 @@ DELIMITER ;//
 CALL populate_t1;
 SET autocommit=1;
 
-SET SESSION debug="+d,fts_instrument_result_cache_limit";
+SET SESSION debug_dbug="+d,fts_instrument_result_cache_limit";
 
 ALTER TABLE t1 ADD FULLTEXT INDEX `text_content_idx` (`text_content`);
 
diff --git a/mysql-test/suite/innodb_fts/t/fulltext.test b/mysql-test/suite/innodb_fts/t/fulltext.test
index 3ddc1856..d9bf14cb 100644
--- a/mysql-test/suite/innodb_fts/t/fulltext.test
+++ b/mysql-test/suite/innodb_fts/t/fulltext.test
@@ -570,6 +570,8 @@ INSERT INTO t2 VALUES (1,'Scargill');
 CREATE TABLE t3 (a int, b int) ENGINE = InnoDB;
 INSERT INTO t3 VALUES (1,1), (2,1);
 
+SELECT * FROM t2 where MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE);
+
 --echo # t2 should use full text index
 EXPLAIN
 SELECT count(*) FROM t1 WHERE 
diff --git a/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test b/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
index 11d2d493..17f319c9 100644
--- a/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
+++ b/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
@@ -127,7 +127,7 @@ INSERT INTO fts_test (title,body) VALUES
 # We could support online fulltext index creation when a FTS_DOC_ID
 # column already exists. This has not been implemented yet.
 --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
-CREATE FULLTEXT INDEX idx on fts_test (title, body) LOCK=NONE;
+ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY, LOCK=NONE;
 if ($MTR_COMBINATION_ORIG) {
 ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body), ALGORITHM=NOCOPY;
 }
@@ -138,7 +138,7 @@ ALTER TABLE fts_test ADD FULLTEXT `idx` (title, body);
 }
 
 --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
-ALTER TABLE fts_test ROW_FORMAT=REDUNDANT, LOCK=NONE;
+ALTER TABLE fts_test ROW_FORMAT=REDUNDANT, ALGORITHM=INPLACE, LOCK=NONE;
 ALTER TABLE fts_test ROW_FORMAT=REDUNDANT;
 
 SELECT * FROM fts_test WHERE MATCH (title, body)
diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test b/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test
index 4eaf5b2e..c0836372 100644
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test
@@ -427,15 +427,9 @@ DROP TABLE t2 , t1;
 # FTS index with compressed row format
 #------------------------------------------------------------------------------
 
-# Save innodb variables
-let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
-
-set global innodb_file_per_table=1;
-
---disable_query_log
 SET @save_innodb_read_only_compressed=@@GLOBAL.innodb_read_only_compressed;
 SET GLOBAL innodb_read_only_compressed=OFF;
---enable_query_log
+
 # Create FTS table
 CREATE TABLE t1 (
         id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
@@ -583,10 +577,7 @@ SELECT * FROM t1 WHERE MATCH (a,b)
 SELECT * FROM t1 ORDER BY id;
 
 DROP TABLE t1;
---disable_query_log
 SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
---enable_query_log
-eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
 
 #------------------------------------------------------------------------------
 # FTS index with utf8 character testcase
diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test b/mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test
index edf7ab21..ca8b80ca 100644
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test
@@ -5,14 +5,6 @@
 # Functional testing with FTS proximity search using '@'
 # and try search default words
 
---disable_warnings
-drop table if exists t1;
---enable_warnings
-
---disable_query_log
-let $innodb_file_per_table_orig = `select @@innodb_file_per_table`;
---enable_query_log
-
 # Create FTS table
 CREATE TABLE t1 (
         id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
@@ -161,10 +153,9 @@ SELECT count(*) FROM t1
 
 DROP TABLE t1;
 
-set global innodb_file_per_table=1;
-
 set names utf8;
 --character_set utf8
+
 # Test fts with externally stored long column
 CREATE TABLE t1 (
 	id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
@@ -259,5 +250,3 @@ SELECT count(*) FROM t1
         AGAINST ('"very blob"@3' IN BOOLEAN MODE);
 
 DROP TABLE t1;
-
-eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test b/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
index 026aeb63..463de63c 100644
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
@@ -608,7 +608,7 @@ INSERT INTO t1 (a,b) VALUES
 
 --connect (con2,localhost,root,,)
 SET NAMES UTF8;
-select @@session.tx_isolation;
+select @@session.transaction_isolation;
 
 # Create the FTS index again
 CREATE FULLTEXT INDEX idx on t1 (a,b);
@@ -704,7 +704,7 @@ INSERT INTO t1 (a,b) VALUES
 
 --connect (con2,localhost,root,,)
 SET NAMES UTF8;
-select @@session.tx_isolation;
+select @@session.transaction_isolation;
 
 # Create the FTS index again
 CREATE FULLTEXT INDEX idx on t1 (a,b);
@@ -823,7 +823,7 @@ INSERT INTO t1 (a,b) VALUES
 
 --connect (con2,localhost,root,,)
 SET NAMES UTF8;
-select @@session.tx_isolation;
+select @@session.transaction_isolation;
 
 # Create the FTS index again
 CREATE FULLTEXT INDEX idx on t1 (a,b);
@@ -919,7 +919,7 @@ INSERT INTO t1 (a,b) VALUES
 
 --connect (con2,localhost,root,,)
 SET NAMES UTF8;
-select @@session.tx_isolation;
+select @@session.transaction_isolation;
 
 # Create the FTS index again
 CREATE FULLTEXT INDEX idx on t1 (a,b);
diff --git a/mysql-test/suite/innodb_fts/t/misc_1.test b/mysql-test/suite/innodb_fts/t/misc_1.test
index 45eaf447..21f25054 100644
--- a/mysql-test/suite/innodb_fts/t/misc_1.test
+++ b/mysql-test/suite/innodb_fts/t/misc_1.test
@@ -429,11 +429,6 @@ DROP TABLE t2 , t1;
 # FTS index with compressed row format
 #------------------------------------------------------------------------------
 
-# Save innodb variables
-let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
-
-set global innodb_file_per_table=1;
-
 # Create FTS table
 CREATE TABLE t1 (
         id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
@@ -581,7 +576,6 @@ SELECT * FROM t1 WHERE MATCH (a,b)
 SELECT * FROM t1 ORDER BY id;
 
 DROP TABLE t1;
-eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
 
 #------------------------------------------------------------------------------
 # FTS index with utf8 character testcase