Merge 10.1 into 10.2

mysql-test/suite/galera/r/galera_parallel_autoinc_largetrx.result

 connection node_1;
-CREATE TABLE ten (f1 INTEGER);
+CREATE TABLE ten (f1 INTEGER) Engine=InnoDB;
 INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB;
 connection node_2;
+set session wsrep_sync_wait=15;
 SET GLOBAL wsrep_slave_threads = 4;
 connection node_1;
 INSERT INTO t1 (f2) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4;;
@@ -13,16 +14,13 @@ INSERT INTO t1 (f2) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4;;
 connection node_1;
 connection node_1a;
 connection node_2;
+disconnect node_1a;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 30000
 SELECT COUNT(DISTINCT f1) FROM t1;
 COUNT(DISTINCT f1)
 30000
-SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
-USER = 'system user' AND STATE NOT LIKE 'InnoDB%';
-COUNT(*)
-3
 connection default;
 DROP TABLE t1;
 DROP TABLE ten;

mysql-test/suite/galera/r/galera_parallel_autoinc_manytrx.result

 connection node_1;
-CREATE TABLE ten (f1 INTEGER);
+CREATE TABLE ten (f1 INTEGER) Engine=InnoDB;
 INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB;
 connection node_2;
+set session wsrep_sync_wait=15;
 SET GLOBAL wsrep_slave_threads = 4;
 connection node_1;
+CREATE PROCEDURE p1 (repeat_count int)
+BEGIN
+DECLARE current_num int;
+SET current_num = 0;
+WHILE current_num < repeat_count do
+INSERT INTO t1 (f2) SELECT 1 FROM ten AS a1;
+COMMIT;
+SET current_num = current_num + 1;
+END WHILE;
+END|
+connection node_1a;
+connection node_1b;
 connection node_2;
-SELECT COUNT(*) = 20000 FROM t1;
-COUNT(*) = 20000
-1
-SELECT COUNT(DISTINCT f1) = 20000 FROM t1;
-COUNT(DISTINCT f1) = 20000
-1
-SELECT COUNT(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE 'committed%';
-COUNT(*) = 4
-1
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+40000
+SELECT COUNT(DISTINCT f1) FROM t1;
+COUNT(DISTINCT f1)
+40000
+disconnect node_1a;
+disconnect node_1b;
 connection default;
 DROP TABLE t1;
 DROP TABLE ten;
+DROP PROCEDURE p1;

mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test

@@ -12,13 +12,18 @@
 --source include/galera_connect.inc
 
 --connection node_1
-CREATE TABLE ten (f1 INTEGER);
+CREATE TABLE ten (f1 INTEGER) Engine=InnoDB;
 INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 
 CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB;
+
 --connection node_2
+set session wsrep_sync_wait=15;
 --let $wsrep_slave_threads_orig = `SELECT @@wsrep_slave_threads`
 SET GLOBAL wsrep_slave_threads = 4;
+--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%');
+--source include/wait_condition.inc
+
 
 --connection node_1
 --send INSERT INTO t1 (f2) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4;
@@ -37,10 +42,9 @@ SET GLOBAL wsrep_slave_threads = 4;
 
 --connection node_2
 --reap
+--disconnect node_1a
 SELECT COUNT(*) FROM t1;
 SELECT COUNT(DISTINCT f1) FROM t1;
-SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE
-  USER = 'system user' AND STATE NOT LIKE 'InnoDB%';
 
 --disable_query_log
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;

mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test

@@ -6,43 +6,78 @@
 --source include/have_innodb.inc
 --source include/big_test.inc
 
-# Create a second connection to node1 so that we can run transactions concurrently
+--connection node_1
+CREATE TABLE ten (f1 INTEGER) Engine=InnoDB;
+INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
+
+CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB;
+
+# Create few connections to node1 so that we can run transactions concurrently
 --let $galera_connection_name = node_1a
 --let $galera_server_number = 1
 --source include/galera_connect.inc
 
---connection node_1
-CREATE TABLE ten (f1 INTEGER);
-INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
+--let $galera_connection_name = node_1b
+--let $galera_server_number = 1
+--source include/galera_connect.inc
 
-CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB;
 --connection node_2
+set session wsrep_sync_wait=15;
 --let $wsrep_slave_threads_orig = `SELECT @@wsrep_slave_threads`
 SET GLOBAL wsrep_slave_threads = 4;
+--let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%');
+--source include/wait_condition.inc
 
 --connection node_1
---let $count = 1000
-while ($count)
-{
-  --disable_query_log
+DELIMITER |;
+CREATE PROCEDURE p1 (repeat_count int)
+BEGIN
+  DECLARE current_num int;
+  SET current_num = 0;
+  WHILE current_num < repeat_count do
     INSERT INTO t1 (f2) SELECT 1 FROM ten AS a1;
-  --enable_query_log
-  --dec $count
-}
+    COMMIT;
+    SET current_num = current_num + 1;
+  END WHILE;
+END|
+DELIMITER ;|
+
+--disable_query_log
+send call p1(1000);
+
+--connection node_1a
+--disable_query_log
+send call p1(1000);
+
+--connection node_1b
+--disable_query_log
+send call p1(1000);
 
 --connection node_2
---let $count = 1000
-while ($count)
-{
-  --disable_query_log
-  INSERT INTO t1 (f2) SELECT 1 FROM ten AS a1;
-  --enable_query_log
-  --dec $count
-}
+--disable_query_log
+send call p1(1000);
+
+--connection node_1
+reap;
+--enable_query_log
 
-SELECT COUNT(*) = 20000 FROM t1;
-SELECT COUNT(DISTINCT f1) = 20000 FROM t1;
-SELECT COUNT(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE 'committed%';
+--connection node_1a
+reap;
+--enable_query_log
+
+--connection node_1b
+reap;
+--enable_query_log
+
+--connection node_2
+reap;
+--enable_query_log
+
+SELECT COUNT(*) FROM t1;
+SELECT COUNT(DISTINCT f1) FROM t1;
+
+--disconnect node_1a
+--disconnect node_1b
 
 --disable_query_log
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
@@ -51,4 +86,6 @@ SELECT COUNT(*) = 4 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system use
 --connection default
 DROP TABLE t1;
 DROP TABLE ten;
+DROP PROCEDURE p1;
+
 

mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff

+--- mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result	2019-05-07 15:09:57.220599318 +0530
++++ mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.reject	2019-05-07 15:10:20.012718538 +0530
+@@ -1,5 +1,7 @@
+ set global innodb_ft_result_cache_limit=5000000000;
++Warnings:
++Warning	1292	Truncated incorrect innodb_ft_result_cache_limit value: '5000000000'
+ select @@innodb_ft_result_cache_limit;
+ @@innodb_ft_result_cache_limit
+-5000000000
++4294967295
+ set global innodb_ft_result_cache_limit=2000000000;

mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_32.result

-set global innodb_ft_result_cache_limit=5000000000;
-Warnings:
-Warning	1292	Truncated incorrect innodb_ft_result_cache_limit value: '5000000000'
-select @@innodb_ft_result_cache_limit;
-@@innodb_ft_result_cache_limit
-4294967295
-set global innodb_ft_result_cache_limit=2000000000;

mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_32.test → mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit.test

---source include/have_32bit.inc
+--source include/word_size.inc
 --source include/have_innodb.inc
 
 let $innodb_ft_result_cache_limit_orig=`select @@innodb_ft_result_cache_limit`;

mysql-test/suite/sys_vars/t/innodb_ft_result_cache_limit_64.test

---source include/have_64bit.inc
---source include/have_innodb.inc
-
-let $innodb_ft_result_cache_limit_orig=`select @@innodb_ft_result_cache_limit`;
-
-set global innodb_ft_result_cache_limit=5000000000;
-select @@innodb_ft_result_cache_limit;
-
-eval set global innodb_ft_result_cache_limit=$innodb_ft_result_cache_limit_orig;