Post-merge fixes to fix test cases. (450cc26b) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/extra/rpl_tests/rpl_log.test

+5 −2

Original line number	Diff line number	Diff line
		@@ -126,9 +126,13 @@ DROP TABLE t3;
		# Bug #6880: LAST_INSERT_ID() within a statement
		#

		# Reset binlog so that show binlog events will not show the tests
		# above.
		source include/master-slave-reset.inc;
		connection master;

		create table t1(a int auto_increment primary key, b int);
		insert into t1 values (NULL, 1);
		reset master;
		set insert_id=5;
		insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
		source include/show_binlog_events.inc;
		@@ -138,4 +142,3 @@ drop table t1;
		# End of 4.1 tests

		sync_slave_with_master;
		drop table t1;

mysql-test/r/distinct.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -653,11 +653,11 @@ DROP TABLE IF EXISTS t2;
		CREATE TABLE t2 (fruit_id INT NOT NULL, fruit_name varchar(20)
		default NULL);
		SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE
		'../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
		LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
		'../../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
		LOAD DATA INFILE '../../tmp/data1.tmp' INTO TABLE t2;
		SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE
		'../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
		LOAD DATA INFILE '../tmp/data2.tmp' INTO TABLE t2;
		'../../tmp/data2.tmp' FROM t1 WHERE fruit_name = 'APPLE';
		LOAD DATA INFILE '../../tmp/data2.tmp' INTO TABLE t2;
		SELECT @v19, @v20;
		@v19 @v20
		2 APPLE

mysql-test/r/log_basic.result

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,3 +17,5 @@ WHERE VARIABLE_NAME='log';
		VARIABLE_VALUE
		OFF
		SET @@global.log= @start_log;
		Warnings:
		Warning 1287 The syntax '@@log' is deprecated and will be removed in MySQL 7.0. Please use '@@general_log' instead

mysql-test/r/mysql_upgrade.result

+9 −9

Original line number	Diff line number	Diff line
		Run mysql_upgrade once
		mtr.global_suppressions OK
		mtr.global_supressions OK
		mtr.suspicious_patterns OK
		mtr.test_suppressions OK
		mtr.test_supressions OK
		mysql.columns_priv OK
		mysql.db OK
		mysql.event OK
		@@ -32,9 +32,9 @@ mysql.user OK
		Run it again - should say already completed
		This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
		Force should run it regardless of wether it's been run before
		mtr.global_suppressions OK
		mtr.global_supressions OK
		mtr.suspicious_patterns OK
		mtr.test_suppressions OK
		mtr.test_supressions OK
		mysql.columns_priv OK
		mysql.db OK
		mysql.event OK
		@@ -65,9 +65,9 @@ mysql.user OK
		CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
		GRANT ALL ON . TO mysqltest1@'%';
		Run mysql_upgrade with password protected account
		mtr.global_suppressions OK
		mtr.global_supressions OK
		mtr.suspicious_patterns OK
		mtr.test_suppressions OK
		mtr.test_supressions OK
		mysql.columns_priv OK
		mysql.db OK
		mysql.event OK
		@@ -97,12 +97,12 @@ mysql.time_zone_transition_type OK
		mysql.user OK
		DROP USER mysqltest1@'%';
		Run mysql_upgrade with a non existing server socket
		mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
		mysqlcheck: Got error: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect
		FATAL ERROR: Upgrade failed
		set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
		mtr.global_suppressions OK
		mtr.global_supressions OK
		mtr.suspicious_patterns OK
		mtr.test_suppressions OK
		mtr.test_supressions OK
		mysql.columns_priv OK
		mysql.db OK
		mysql.event OK

mysql-test/suite/federated/federated.result

+0 −1

Original line number	Diff line number	Diff line
		@@ -2133,4 +2133,3 @@ DROP TABLE IF EXISTS federated.t1;
		DROP DATABASE IF EXISTS federated;
		DROP TABLE IF EXISTS federated.t1;
		DROP DATABASE IF EXISTS federated;
		SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;