Merge 10.0-galera into 10.1

18 files changed, 176 insertions, 228 deletions

diff --git a/mysql-test/suite/wsrep/t/alter_table_innodb.opt b/mysql-test/suite/wsrep/t/alter_table_innodb.opt
new file mode 100644
index 00000000000..1e84570d7f6
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/alter_table_innodb.opt
@@ -0,0 +1 @@
+--wsrep-on=0
diff --git a/mysql-test/suite/wsrep/t/alter_table_innodb.test b/mysql-test/suite/wsrep/t/alter_table_innodb.test
new file mode 100644
index 00000000000..ca06be02a85
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/alter_table_innodb.test
@@ -0,0 +1,10 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # MDEV-7374 : Losing connection to MySQL while running ALTER TABLE
+--echo #
+CREATE TABLE t1(i INT) ENGINE=INNODB;
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 SELECT a.* FROM t1 a, t1 b, t1 c, t1 d, t1 e;
+ALTER TABLE t1 MODIFY i FLOAT;
+DROP TABLE t1;
diff --git a/mysql-test/suite/wsrep/t/basic.test b/mysql-test/suite/wsrep/t/basic.test
deleted file mode 100644
index ad220f96f55..00000000000
--- a/mysql-test/suite/wsrep/t/basic.test
+++ /dev/null
@@ -1,48 +0,0 @@
---source include/galera_cluster.inc
---source include/have_innodb.inc
-
-USE test;
-CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=INNODB;
-INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
-SELECT * FROM t1;
-
---echo
---echo # On node_1
---connection node_1
-SELECT * FROM test.t1;
-
---echo
---echo # On node_2
---connection node_2
-SELECT * FROM test.t1;
-
---let $galera_diff_statement = SELECT * FROM t1
---source include/galera_diff.inc
-
-# Cleanup
-DROP TABLE t1;
-
---echo #
---echo # MDEV-7397: SIGSEGV on inserting into a key-less table
---echo #
-
---echo
---echo # On node_1
---connection node_1
-USE test;
-CREATE TABLE t1(c1 INT) ENGINE=INNODB;
-INSERT INTO t1 VALUES (1);
-SELECT * FROM t1;
-
---echo
---echo # On node_2
---connection node_2
-SELECT * FROM test.t1;
-
---let $galera_diff_statement = SELECT * FROM t1
---source include/galera_diff.inc
-# Cleanup
-DROP TABLE t1;
-
---source include/galera_end.inc
---echo # End of test
diff --git a/mysql-test/suite/wsrep/t/binlog_format.opt b/mysql-test/suite/wsrep/t/binlog_format.opt
index beae84b3862..e3f2470c6e5 100644
--- a/mysql-test/suite/wsrep/t/binlog_format.opt
+++ b/mysql-test/suite/wsrep/t/binlog_format.opt
@@ -1 +1 @@
---log-bin
+--innodb_autoinc_lock_mode=2 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm://
diff --git a/mysql-test/suite/wsrep/t/binlog_format.test b/mysql-test/suite/wsrep/t/binlog_format.test
index 99d34873512..a2dc8542322 100644
--- a/mysql-test/suite/wsrep/t/binlog_format.test
+++ b/mysql-test/suite/wsrep/t/binlog_format.test
@@ -1,18 +1,18 @@
---source include/have_wsrep_enabled.inc
+--source include/have_wsrep_provider.inc
 --source include/have_binlog_format_row.inc
-#
-# MDEV-4227: Galera server should stop crashing on setting binlog_format STATEMENT
-#
+
+call mtr.add_suppression("WSREP: MariaDB Galera does not support binlog format.*");
 call mtr.add_suppression("WSREP: cannot get fake InnoDB transaction ID");
-call mtr.add_suppression("WSREP: Could not open saved state file for reading:.*");
+
+--echo #
+--echo # MDEV-4227: Galera server should stop crashing on setting binlog_format STATEMENT
+--echo #
 
 SHOW VARIABLES LIKE 'binlog_format';
--- error ER_WRONG_VALUE_FOR_VAR
 SET binlog_format=STATEMENT;
 SHOW WARNINGS;
 SHOW VARIABLES LIKE 'binlog_format';
 CREATE TABLE IF NOT EXISTS test.t1 AS SELECT * FROM information_schema.routines WHERE 1 = 0;
--- error ER_WRONG_VALUE_FOR_VAR
 SET binlog_format=MIXED;
 SHOW WARNINGS;
 SHOW VARIABLES LIKE 'binlog_format';
@@ -25,3 +25,23 @@ DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
 DROP TABLE IF EXISTS test.t3;
 
+--echo #
+--echo # MDEV-7322: Option to allow setting the binlog_format with Galera
+--echo #
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET @@GLOBAL.binlog_format=STATEMENT;
+SHOW GLOBAL VARIABLES LIKE 'binlog_format';
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET @@GLOBAL.binlog_format=MIXED;
+SHOW GLOBAL VARIABLES LIKE 'binlog_format';
+
+-- error ER_WRONG_VALUE_FOR_VAR
+SET @@GLOBAL.binlog_format=DEFAULT;
+SHOW GLOBAL VARIABLES LIKE 'binlog_format';
+
+SET @@GLOBAL.binlog_format=ROW;
+SHOW GLOBAL VARIABLES LIKE 'binlog_format';
+
+--echo # End of test.
diff --git a/mysql-test/suite/wsrep/t/foreign_key.opt b/mysql-test/suite/wsrep/t/foreign_key.opt
new file mode 100644
index 00000000000..e3f2470c6e5
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/foreign_key.opt
@@ -0,0 +1 @@
+--innodb_autoinc_lock_mode=2 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm://
diff --git a/mysql-test/suite/wsrep/t/foreign_key.test b/mysql-test/suite/wsrep/t/foreign_key.test
new file mode 100644
index 00000000000..71f6076a1d7
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/foreign_key.test
@@ -0,0 +1,20 @@
+--source include/have_wsrep_enabled.inc
+--source include/have_binlog_format_row.inc
+--source include/have_innodb.inc
+
+USE test;
+create table p(v varchar(20), i int, primary key(v,i)) engine=innodb character set = utf8;
+create table c(k int primary key, v varchar(20), i int, foreign key(v,i) references p(v,i)) engine=innodb character set = utf8;
+insert into p values (_utf32 0x000004100000041100000412, 1);
+insert into c values (1, _utf32 0x000004100000041100000412, 1);
+
+SELECT * FROM test.p;
+SELECT * FROM test.c;
+
+SELECT * FROM test.p;
+SELECT * FROM test.c;
+
+# Cleanup
+DROP TABLE c;
+DROP TABLE p;
+
diff --git a/mysql-test/suite/wsrep/t/galera_var_dirty_reads.test b/mysql-test/suite/wsrep/t/galera_var_dirty_reads.test
deleted file mode 100644
index 855f4abdbf0..00000000000
--- a/mysql-test/suite/wsrep/t/galera_var_dirty_reads.test
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Check the handling of @@wsrep_dirty_reads
-#
-
---source include/galera_cluster.inc
---source include/have_innodb.inc
-
---connection node_2
---let $wsrep_cluster_address_saved = `SELECT @@global.wsrep_cluster_address`
-
-CREATE TABLE t1(i INT) ENGINE=INNODB;
-INSERT INTO t1 VALUES(1);
-SELECT * FROM t1;
-
-SET @@global.wsrep_cluster_address = '';
-SET @@session.wsrep_dirty_reads=OFF;
-
-# Set wsrep_sync_wait to avoid ER_LOCK_WAIT_TIMEOUT (MDEV-6832).
-SET SESSION wsrep_sync_wait=0;
-
-# Must return 'OFF'
-SHOW STATUS LIKE 'wsrep_ready';
-
-# Must return 'Non-primary'
-SHOW STATUS LIKE 'wsrep_cluster_status';
-
---error ER_UNKNOWN_COM_ERROR
-SELECT * FROM t1;
-
-SET @@session.wsrep_dirty_reads=ON;
-
-SELECT * FROM t1;
-
---disable_query_log
---eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved'
---enable_query_log
---source include/wait_until_connected_again.inc
-
---connection node_1
-SELECT * FROM t1;
-# Cleanup
-DROP TABLE t1;
-
---source include/galera_end.inc
---echo # End of test
-
diff --git a/mysql-test/suite/wsrep/t/grant.test b/mysql-test/suite/wsrep/t/grant.test
deleted file mode 100644
index de1c202cfbb..00000000000
--- a/mysql-test/suite/wsrep/t/grant.test
+++ /dev/null
@@ -1,25 +0,0 @@
---source include/galera_cluster.inc
---source include/have_innodb.inc
-
---echo #
---echo # MDEV#6266: Changing password fails on galera cluster
---echo #
-
---echo
---echo # On node_1
---connection node_1
-GRANT SELECT ON *.* TO 'user_6266'@'localhost' IDENTIFIED BY 'pass';
---echo
---echo # Now, try changing password for 'user_6266'. This command should also
---echo # execute successfully on the other node.
-SET PASSWORD FOR 'user_6266'@'localhost' = PASSWORD('newpass');
-
---echo
---echo # On node_2
---connection node_2
-SELECT user FROM mysql.user WHERE user='user_6266';
-# cleanup
-DROP USER 'user_6266'@'localhost';
-
---source include/galera_end.inc
---echo # End of test
diff --git a/mysql-test/suite/wsrep/t/mdev_6832.opt b/mysql-test/suite/wsrep/t/mdev_6832.opt
new file mode 100644
index 00000000000..459a9702707
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/mdev_6832.opt
@@ -0,0 +1 @@
+--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --wsrep_causal_reads=ON
diff --git a/mysql-test/suite/wsrep/t/mdev_6832.test b/mysql-test/suite/wsrep/t/mdev_6832.test
new file mode 100644
index 00000000000..9efccface57
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/mdev_6832.test
@@ -0,0 +1,15 @@
+--source include/have_wsrep_provider.inc
+--source include/have_binlog_format_row.inc
+
+--echo #
+--echo # MDEV-6832: ER_LOCK_WAIT_TIMEOUT on SHOW STATUS
+--echo #
+
+SHOW STATUS LIKE 'wsrep_ready';
+--disable_query_log
+eval SET @@global.wsrep_provider='$WSREP_PROVIDER';
+--enable_query_log
+SHOW STATUS LIKE 'wsrep_ready';
+SET @@global.wsrep_cluster_address='gcomm://';
+
+--echo # End of test.
diff --git a/mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink.test b/mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink.test
new file mode 100644
index 00000000000..100e09d3afb
--- /dev/null
+++ b/mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink.test
@@ -0,0 +1,40 @@
+--source include/have_wsrep.inc
+--source include/have_symlink.inc
+--source include/not_windows.inc
+
+--echo #
+--echo # MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above
+--echo #
+
+--exec mkdir $MYSQLTEST_VARDIR/zoneinfo
+--exec ln -s $MYSQLTEST_VARDIR/zoneinfo $MYSQLTEST_VARDIR/zoneinfo/posix
+--copy_file std_data/zoneinfo/GMT $MYSQLTEST_VARDIR/zoneinfo/GMT
+--copy_file std_data/words.dat $MYSQLTEST_VARDIR/zoneinfo/garbage
+--copy_file std_data/words.dat $MYSQLTEST_VARDIR/zoneinfo/ignored.tab
+
+--echo # Verbose run
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_TZINFO_TO_SQL --verbose $MYSQLTEST_VARDIR/zoneinfo 2>&1
+
+--echo # Silent run
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo 2>&1
+
+--echo #
+--echo # Testing with explicit timezonefile
+--echo #
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo/GMT XXX 2>&1
+
+--echo #
+--echo # Testing --leap
+--echo #
+
+--exec $MYSQL_TZINFO_TO_SQL --leap $MYSQLTEST_VARDIR/zoneinfo/GMT 2>&1
+
+#
+# Cleanup
+#
+
+--exec rm -rf $MYSQLTEST_VARDIR/zoneinfo
diff --git a/mysql-test/suite/wsrep/t/partition.test b/mysql-test/suite/wsrep/t/partition.test
deleted file mode 100644
index 048f35a9282..00000000000
--- a/mysql-test/suite/wsrep/t/partition.test
+++ /dev/null
@@ -1,31 +0,0 @@
---source include/galera_cluster.inc
---source include/have_innodb.inc
---source include/have_partition.inc
-
---echo #
---echo # MDEV#4953 Galera: DELETE from a partitioned table is not replicated
---echo #
-
-USE test;
-CREATE TABLE t1 (pk INT PRIMARY KEY, i INT) ENGINE=INNODB PARTITION BY HASH(pk) PARTITIONS 2;
-INSERT INTO t1 VALUES (1,100), (2,200);
-SELECT * FROM t1;
-
-DELETE FROM t1;
-SELECT * FROM t1;
-
---echo
---echo # On node_1
---connection node_1
-SELECT * FROM t1;
-
---echo
---echo # On node_2
---connection node_2
-SELECT * FROM t1;
-
-# Cleanup
-DROP TABLE t1;
-
---source include/galera_end.inc
---echo # End of test
diff --git a/mysql-test/suite/wsrep/t/pool_of_threads.opt b/mysql-test/suite/wsrep/t/pool_of_threads.opt
index 76b95d050d1..814417e5b0f 100644
--- a/mysql-test/suite/wsrep/t/pool_of_threads.opt
+++ b/mysql-test/suite/wsrep/t/pool_of_threads.opt
@@ -1 +1 @@
---thread_handling=pool-of-threads
+--innodb_autoinc_lock_mode=2 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --thread_handling=pool-of-threads
diff --git a/mysql-test/suite/wsrep/t/pool_of_threads.test b/mysql-test/suite/wsrep/t/pool_of_threads.test
index e133ddf35dd..dbf429e3f01 100644
--- a/mysql-test/suite/wsrep/t/pool_of_threads.test
+++ b/mysql-test/suite/wsrep/t/pool_of_threads.test
@@ -1,4 +1,5 @@
---source include/have_wsrep_enabled.inc
+--source include/have_wsrep.inc
+--source include/have_binlog_format_row.inc
 
 --echo
 --echo #
diff --git a/mysql-test/suite/wsrep/t/unique_key.test b/mysql-test/suite/wsrep/t/unique_key.test
deleted file mode 100644
index aac3c541355..00000000000
--- a/mysql-test/suite/wsrep/t/unique_key.test
+++ /dev/null
@@ -1,51 +0,0 @@
---source include/galera_cluster.inc
-
---echo #
---echo # MDEV#5552 Deadlock when inserting NULL column value in column with
---echo # UNIQUE index
---echo #
-
-USE test;
---echo
---echo # On node_1
---connection node_1
-CREATE TABLE t1(c1 INT DEFAULT NULL, UNIQUE KEY c1(c1)) ENGINE=INNODB;
-INSERT INTO t1 VALUES (NULL);
-INSERT INTO t1 VALUES (NULL);
-SELECT * FROM test.t1;
-
---echo
---echo # On node_2
---connection node_2
-SELECT * FROM test.t1;
-
---echo
---echo # On node_1
---connection node_1
-INSERT INTO t1 VALUES (1);
-UPDATE t1 SET c1=NULL WHERE c1=1;
-SELECT * FROM test.t1;
---echo
---echo # On node_2
---connection node_2
-SELECT * FROM test.t1;
-
---echo
---echo # On node_1
---connection node_1
-DELETE FROM t1 WHERE c1<=>NULL;
-SELECT * FROM test.t1;
-
---echo
---echo # On node_2
---connection node_2
-SELECT * FROM test.t1;
-
---let $galera_diff_statement = SELECT * FROM t1
---source include/galera_diff.inc
-
-# Cleanup
-DROP TABLE t1;
-
---source include/galera_end.inc
---echo # End of test
diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test
index 98045e2b014..ef795ca9cfa 100644
--- a/mysql-test/suite/wsrep/t/variables.test
+++ b/mysql-test/suite/wsrep/t/variables.test
@@ -1,5 +1,7 @@
 --source include/have_wsrep.inc
---source include/have_innodb.inc
+
+SET @wsrep_provider_options_saved= @@global.wsrep_provider_options;
+SET @wsrep_cluster_address_saved= @@global.wsrep_cluster_address;
 
 --echo
 --echo # MDEV#5534: mysql_tzinfo_to_sql generates wrong query
@@ -16,12 +18,19 @@ SET GLOBAL wsrep_replicate_myisam= ON;
 
 # Reset it back.
 SET GLOBAL wsrep_replicate_myisam= OFF;
+SET GLOBAL wsrep_provider=none;
 
 --echo #
 --echo # MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of
 --echo # variables when using "_"
 --echo #
 
+CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*");
+
+--disable_query_log
+eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
+--enable_query_log
+
 --replace_column 2 #
 SHOW GLOBAL STATUS LIKE 'wsrep%';
 
@@ -35,10 +44,17 @@ SHOW GLOBAL STATUS LIKE 'wsrep_local_state_comment';
 --echo # Should show nothing.
 SHOW STATUS LIKE 'x';
 
+# Reset it back.
+SET GLOBAL wsrep_provider=none;
+
 --echo #
 --echo # MDEV#6079: xtrabackup SST failing with maria-10.0-galera
 --echo #
 
+--disable_query_log
+eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
+--enable_query_log
+
 # The following 2 variables are used in innobackupex during xtrabackup-based
 # SST.
 --echo
@@ -48,10 +64,18 @@ SHOW STATUS LIKE 'wsrep_local_state_uuid';
 --replace_column 2 #
 SHOW STATUS LIKE 'wsrep_last_committed';
 
+# Reset it back.
+SET GLOBAL wsrep_provider=none;
+
 --echo
 --echo #
 --echo # MDEV#6206: wsrep_slave_threads subtracts from max_connections
 --echo #
+call mtr.add_suppression("WSREP: Failed to get provider options");
+
+--disable_query_log
+eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
+--enable_query_log
 
 --replace_regex /.*libgalera_smm.*/libgalera_smm.so/
 SELECT @@global.wsrep_provider;
@@ -61,15 +85,36 @@ SHOW STATUS LIKE 'threads_connected';
 SHOW STATUS LIKE 'wsrep_thread_count';
 --echo
 
+--disable_query_log
+eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
+--enable_query_log
+
+--replace_regex /.*libgalera_smm.*/libgalera_smm.so/
+SELECT @@global.wsrep_provider;
+SELECT @@global.wsrep_cluster_address;
+SHOW STATUS LIKE 'threads_connected';
+SHOW STATUS LIKE 'wsrep_thread_count';
+--echo
+
+--echo # Setting wsrep_cluster_address triggers the creation of
+--echo # applier/rollbacker threads.
+SET GLOBAL wsrep_cluster_address= 'gcomm://';
+--echo # Wait for applier threads to get created.
+sleep 3; 
+
+--replace_regex /.*libgalera_smm.*/libgalera_smm.so/
+SELECT @@global.wsrep_provider;
+SELECT @@global.wsrep_cluster_address;
+SHOW STATUS LIKE 'threads_connected';
+SHOW STATUS LIKE 'wsrep_thread_count';
+--echo
+
 SET @wsrep_slave_threads_saved= @@global.wsrep_slave_threads;
 SET GLOBAL wsrep_slave_threads= 10;
 --echo # Wait for applier threads to get created.
-sleep 5; 
-SHOW STATUS LIKE 'wsrep_thread_count';
+sleep 3; 
 SHOW STATUS LIKE 'threads_connected';
-
-# reset (for mtr internal checks)
-SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved;
+SHOW STATUS LIKE 'wsrep_thread_count';
 
 --echo #
 --echo # MDEV#6411: Setting set @@global.wsrep_sst_auth=NULL causes crash
@@ -83,5 +128,11 @@ SET @@global.wsrep_sst_auth= NULL;
 SELECT @@global.wsrep_sst_auth;
 SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved;
 
+# Reset (for mtr internal checks)
+SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved;
+SET GLOBAL wsrep_provider= none;
+SET GLOBAL wsrep_cluster_address= @wsrep_cluster_address_saved;
+SET GLOBAL wsrep_provider_options= @wsrep_provider_options_saved;
+
 --echo # End of test.
 
diff --git a/mysql-test/suite/wsrep/t/view.test b/mysql-test/suite/wsrep/t/view.test
deleted file mode 100644
index 6768917589c..00000000000
--- a/mysql-test/suite/wsrep/t/view.test
+++ /dev/null
@@ -1,11 +0,0 @@
---source include/galera_cluster.inc
---source include/have_innodb.inc
-
---echo #
---echo # MDEV-7222: Cluster Node Crash at CREATE DEFINER statement
---echo #
-USE test;
-CREATE DEFINER=CURRENT_USER VIEW v1 AS SELECT 1;
-DROP VIEW v1;
-
---echo # End of tests