Merge BUG#39007 (309c38c4) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf

+0 −4

Original line number	Diff line number	Diff line
		@@ -3,17 +3,14 @@
		[mysqld.1.1]
		server-id= 1
		log-bin
		log-slave-updates

		[mysqld.2.1]
		server-id= 1
		log-bin
		log-slave-updates

		[mysqld.1.slave]
		server-id= 2
		log-bin
		log-slave-updates
		skip-slave-start

		[mysqld.2.slave]
		@@ -25,7 +22,6 @@ master-user= @mysqld.2.1.#user
		master-connect-retry= 1
		init-rpl-role= slave
		log-bin
		log-slave-updates
		skip-slave-start
		ndb_connectstring= @mysql_cluster.slave.ndb_connectstring

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		#############################################################
		--source include/have_ndb.inc
		--source include/ndb_master-slave_2ch.inc
		--source include/have_binlog_format_mixed_or_row.inc
		--echo

		# Check server_id and set auto_increment_* variables