Merge 10.3 into 10.4

extra/mariabackup/backup_mysql.cc

@@ -1092,6 +1092,7 @@ write_slave_info(MYSQL *connection)
 	char *master = NULL;
 	char *filename = NULL;
 	char *gtid_executed = NULL;
+	char *using_gtid = NULL;
 	char *position = NULL;
 	char *gtid_slave_pos = NULL;
 	char *ptr;
@@ -1102,6 +1103,7 @@ write_slave_info(MYSQL *connection)
 		{"Relay_Master_Log_File", &filename},
 		{"Exec_Master_Log_Pos", &position},
 		{"Executed_Gtid_Set", &gtid_executed},
+		{"Using_Gtid", &using_gtid},
 		{NULL, NULL}
 	};
 
@@ -1142,7 +1144,8 @@ write_slave_info(MYSQL *connection)
 		ut_a(asprintf(&mysql_slave_position,
 			"master host '%s', purge list '%s'",
 			master, gtid_executed) != -1);
-	} else if (gtid_slave_pos && *gtid_slave_pos) {
+	} else if (gtid_slave_pos && *gtid_slave_pos &&
+			!(using_gtid && !strncmp(using_gtid, "No", 2))) {
 		/* MariaDB >= 10.0 with GTID enabled */
 		result = backup_file_printf(XTRABACKUP_SLAVE_INFO,
 			"SET GLOBAL gtid_slave_pos = '%s';\n"

include/mysql/service_wsrep.h

@@ -85,6 +85,8 @@ extern struct wsrep_service_st {
   void                        (*wsrep_commit_ordered_func)(MYSQL_THD thd);
   my_bool                     (*wsrep_thd_is_applying_func)(const MYSQL_THD thd);
   bool                        (*wsrep_thd_set_wsrep_aborter_func)(MYSQL_THD bf_thd, MYSQL_THD thd);
+  void                        (*wsrep_report_bf_lock_wait_func)(const MYSQL_THD thd,
+                                                                unsigned long long trx_id);
 } *wsrep_service;
 
 #define MYSQL_SERVICE_WSREP_INCLUDED
@@ -126,7 +128,7 @@ extern struct wsrep_service_st {
 #define wsrep_commit_ordered(T) wsrep_service->wsrep_commit_ordered_func(T)
 #define wsrep_thd_is_applying(T) wsrep_service->wsrep_thd_is_applying_func(T)
 #define wsrep_thd_set_wsrep_aborter(T) wsrep_service->wsrep_thd_set_wsrep_aborter_func(T1, T2)
-
+#define wsrep_report_bf_lock_wait(T,I) wsrep_service->wsrep_report_bf_lock_wait(T,I)
 #else
 
 #define MYSQL_SERVICE_WSREP_STATIC_INCLUDED
@@ -221,6 +223,7 @@ extern "C" my_bool wsrep_get_debug();
 extern "C" void wsrep_commit_ordered(MYSQL_THD thd);
 extern "C" my_bool wsrep_thd_is_applying(const MYSQL_THD thd);
 extern "C" bool wsrep_thd_set_wsrep_aborter(MYSQL_THD bf_thd, MYSQL_THD victim_thd);
-
+extern "C" void wsrep_report_bf_lock_wait(const THD *thd,
+                                          unsigned long long trx_id);
 #endif
 #endif /* MYSQL_SERVICE_WSREP_INCLUDED */

mysql-test/main/windows_debug.result

@@ -0,0 +1,4 @@
+# mdev-23741 sharing violation when renaming .frm file in ALTER
+CREATE TABLE t(i int);
+SET STATEMENT debug_dbug='+d,rename_sharing_violation' FOR ALTER TABLE t ADD PRIMARY KEY (i);
+DROP TABLE t;

mysql-test/main/windows_debug.test

@@ -0,0 +1,11 @@
+# Windows-specific tests , debug mode
+
+--source include/have_debug.inc
+--source include/windows.inc
+
+--echo # mdev-23741 sharing violation when renaming .frm file in ALTER
+CREATE TABLE t(i int);
+SET STATEMENT debug_dbug='+d,rename_sharing_violation' FOR ALTER TABLE t ADD PRIMARY KEY (i);
+DROP TABLE t;
+
+#End of 10.3 tests

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

@@ -4,48 +4,45 @@ connection node_1;
 connection node_2;
 connection node_1;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
-CREATE PROCEDURE p1 ()
-BEGIN
-DECLARE x INT DEFAULT 1;
-DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
-WHILE 1 DO
-INSERT INTO t1 VALUES (DEFAULT);
-COMMIT;
-END WHILE;
-END|
-CALL p1();;
-connection node_2;
-CALL p1();;
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
 connection node_2a;
 Killing server ...
-INSERT INTO t1 VALUES (DEFAULT);
-connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
-connection node_1a;
-INSERT INTO t1 VALUES (DEFAULT);
 connection node_1;
-Got one of the listed errors
-connection node_2;
-Got one of the listed errors
-connection node_1a;
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
 connection node_2a;
-count_equal
-1
-CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0");
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE
-2
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 2
-1
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 connection node_1a;
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE
-2
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 2
-1
-DROP PROCEDURE p1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+132
+connection node_2a;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+132
+connection node_1;
 DROP TABLE t1;
 CALL mtr.add_suppression("gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)");
 CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0");
+disconnect node_1a;
+disconnect node_2a;

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

@@ -6,11 +6,11 @@ connection node_1;
 connection node_2;
 connection node_3;
 connection node_4;
-SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 4
-1
+SELECT VARIABLE_VALUE AS EXPECT_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+EXPECT_4
+4
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER);
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=INNODB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 INSERT INTO t1 VALUES (2);
@@ -22,60 +22,78 @@ connection node_3;
 INSERT INTO t1 VALUES (13);
 Shutting down server ...
 connection node_1;
+SELECT VARIABLE_VALUE AS EXPECT_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+EXPECT_3
+3
 INSERT INTO t1 VALUES (11);
 connection node_2;
 INSERT INTO t1 VALUES (12);
 connection node_4;
 INSERT INTO t1 VALUES (14);
 connection node_3;
+SELECT VARIABLE_VALUE AS EXPECT_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+EXPECT_4
+4
 INSERT INTO t1 VALUES (131);
 connection node_2;
 INSERT INTO t1 VALUES (22);
 Shutting down server ...
 connection node_1;
+SELECT VARIABLE_VALUE AS EXPECT_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+EXPECT_3
+3
 INSERT INTO t1 VALUES (21);
 connection node_3;
 INSERT INTO t1 VALUES (23);
 connection node_4;
 INSERT INTO t1 VALUES (24);
 connection node_2;
+SELECT VARIABLE_VALUE AS EXPECT_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+EXPECT_4
+4
 INSERT INTO t1 VALUES (221);
 connection node_4;
 INSERT INTO t1 VALUES (34);
 Shutting down server ...
 connection node_1;
+SELECT VARIABLE_VALUE AS EXPECT_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+EXPECT_3
+3
 INSERT INTO t1 VALUES (31);
 connection node_2;
 INSERT INTO t1 VALUES (32);
 connection node_3;
 INSERT INTO t1 VALUES (33);
 connection node_4;
+SELECT VARIABLE_VALUE AS EXPECT_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+EXPECT_4
+4
 INSERT INTO t1 VALUES (341);
 connection node_1;
-SELECT COUNT(*) = 19 FROM t1;
-COUNT(*) = 19
-1
+SELECT COUNT(*) AS EXPECT_19 FROM t1;
+EXPECT_19
+19
 connection node_2;
 SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 4
 1
-SELECT COUNT(*) = 19 FROM t1;
-COUNT(*) = 19
-1
+SELECT COUNT(*) AS EXPECT_19 FROM t1;
+EXPECT_19
+19
 connection node_3;
 SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 4
 1
-SELECT COUNT(*) = 19 FROM t1;
-COUNT(*) = 19
-1
+SELECT COUNT(*) AS EXPECT_19 FROM t1;
+EXPECT_19
+19
 connection node_4;
 SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 4
 1
-SELECT COUNT(*) = 19 FROM t1;
-COUNT(*) = 19
-1
+SELECT COUNT(*) AS EXPECT_19 FROM t1;
+EXPECT_19
+19
 connection node_1;
 DROP TABLE t1;
 CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
@@ -86,5 +104,6 @@ CALL mtr.add_suppression("There are no nodes in the same segment that will ever
 CALL mtr.add_suppression("Action message in non-primary configuration from member 0");
 connection node_4;
 CALL mtr.add_suppression("Action message in non-primary configuration from member 0");
-disconnect node_2;
-disconnect node_1;
+connection node_1;
+disconnect node_3;
+disconnect node_4;

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

@@ -2,93 +2,62 @@
 # Test that autoincrement works correctly while the cluster membership
 # is changing and SST takes place.
 #
-
 --source include/big_test.inc
 --source include/galera_cluster.inc
---source include/have_innodb.inc
 --source include/have_mariabackup.inc
+--source include/force_restart.inc
 
 --let $node_1=node_1
 --let $node_2=node_2
 --source include/auto_increment_offset_save.inc
 
 --connection node_1
---let $connection_id = `SELECT CONNECTION_ID()`
-
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
 
-# Issue an endless stream of autoincrement inserts
-
-DELIMITER |;
-CREATE PROCEDURE p1 ()
-BEGIN
-	DECLARE x INT DEFAULT 1;
-	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
-
-	WHILE 1 DO
-	        INSERT INTO t1 VALUES (DEFAULT);
-		COMMIT;
-	END WHILE;
-END|
-DELIMITER ;|
-
---send CALL p1();
---sleep 1
-
---connection node_2
---send CALL p1();
---sleep 1
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
 
 # Kill and restart node #2
-
 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
 --connection node_2a
 --source include/kill_galera.inc
-
 --remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat
---source include/start_mysqld.inc
-
-INSERT INTO t1 VALUES (DEFAULT);
-
-# Terminate the stored procedure
-
---connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
---connection node_1a
---disable_query_log
---eval KILL CONNECTION $connection_id
---enable_query_log
-INSERT INTO t1 VALUES (DEFAULT);
 
 --connection node_1
-# CR_SERVER_LOST
---error 2013,2006
---reap
-
---connection node_2
-# CR_SERVER_LOST
---error 2013,2006
---reap
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
 
-# Confirm that the count is correct and that the cluster is intact
+--connection node_2a
+--source include/start_mysqld.inc
+--source include/wait_until_connected_again.inc
+
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
+INSERT INTO t1 VALUES (NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
 
+--connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
 --connection node_1a
---let $count = `SELECT COUNT(*) FROM t1`
+SELECT COUNT(*) FROM t1;
 
 --connection node_2a
---disable_query_log
---eval SELECT COUNT(*) = $count AS count_equal FROM t1
---enable_query_log
-
-CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0");
-
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-
---connection node_1a
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+SELECT COUNT(*) FROM t1;
 
-DROP PROCEDURE p1;
+--connection node_1
 DROP TABLE t1;
 
 CALL mtr.add_suppression("gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)");
@@ -97,3 +66,6 @@ CALL mtr.add_suppression("WSREP: Action message in non-primary configuration fro
 --let $node_1=node_1a
 --let $node_2=node_2a
 --source include/auto_increment_offset_restore.inc
+
+--disconnect node_1a
+--disconnect node_2a