Merge 11.4 into 11.6

mysql-test/suite/innodb/r/alter_copy_bulk,ON.rdiff

@@ -0,0 +1,11 @@
+--- alter_copy_bulk.result
++++ alter_copy_bulk.result
+@@ -4,7 +4,7 @@
+ INSERT INTO t1 SELECT repeat('b', 200), seq FROM seq_3_to_65536;
+ ALTER TABLE t1 ALGORITHM=COPY, ADD INDEX(f2);
+ ALTER TABLE t1 ALGORITHM=COPY, ADD PRIMARY KEY(f1(2));
+-ERROR 23000: Duplicate entry 'aa' for key 'PRIMARY'
++ERROR 23000: Duplicate entry 'bb' for key 'PRIMARY'
+ INSERT INTO t1 VALUES(repeat('a', 200), 1);
+ ALTER TABLE t1 ALGORITHM=COPY, ADD UNIQUE KEY(f2);
+ ERROR 23000: Duplicate entry '1' for key 'f2_2'

mysql-test/suite/innodb/r/alter_copy_bulk.result

@@ -1,26 +1,50 @@
-SET @@alter_algorithm=COPY;
-Warnings:
-Warning	4200	The variable '@@alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release
 CREATE TABLE t1(f1 CHAR(200), f2 INT NOT NULL)engine=InnoDB;
 INSERT INTO t1 SELECT repeat('a', 200), seq FROM seq_1_to_2;
-ALTER TABLE t1 FORCE;
+ALTER TABLE t1 ALGORITHM=COPY, FORCE;
 INSERT INTO t1 SELECT repeat('b', 200), seq FROM seq_3_to_65536;
-ALTER TABLE t1 ADD INDEX(f2);
-ALTER TABLE t1 ADD PRIMARY KEY(f1(2));
-ERROR 23000: Duplicate entry 'aaaaaaaa' for key 'PRIMARY'
+ALTER TABLE t1 ALGORITHM=COPY, ADD INDEX(f2);
+ALTER TABLE t1 ALGORITHM=COPY, ADD PRIMARY KEY(f1(2));
+ERROR 23000: Duplicate entry 'aa' for key 'PRIMARY'
 INSERT INTO t1 VALUES(repeat('a', 200), 1);
-ALTER TABLE t1 ADD UNIQUE KEY(f2);
+ALTER TABLE t1 ALGORITHM=COPY, ADD UNIQUE KEY(f2);
 ERROR 23000: Duplicate entry '1' for key 'f2_2'
 ALTER IGNORE TABLE t1 MODIFY f1 CHAR(200) NOT NULL;
 CREATE TABLE t2(f1 INT NOT NULL,
 FOREIGN KEY(f1) REFERENCES t1(f2))ENGINE=InnoDB;
 INSERT INTO t2 VALUES(1);
-ALTER TABLE t2 FORCE;
+ALTER TABLE t2 ALGORITHM=COPY, FORCE;
 DROP TABLE t2, t1;
 CREATE TABLE t1 (f1 INT, f2 INT) ENGINE=InnoDB PARTITION BY HASH(f1) PARTITIONS 2;
 INSERT INTO t1 VALUES(1, 1);
 INSERT INTO t1 SELECT seq, seq * 2 FROM seq_1_to_2;
-ALTER TABLE t1 FORCE;
+ALTER TABLE t1 ALGORITHM=COPY, FORCE;
 INSERT INTO t1 SELECT seq, seq * 2 FROM seq_3_to_65536;
-ALTER TABLE t1 ADD INDEX(f2);
+ALTER TABLE t1 ALGORITHM=COPY, ADD INDEX(f2);
 DROP TABLE t1;
+#
+# MDEV-34756 Validation of new foreign key skipped
+#            if innodb_alter_copy_bulk=ON
+#
+CREATE TABLE t1(f1 INT NOT NULL PRIMARY KEY,
+f2 INT NOT NULL)ENGINE=InnoDB;
+CREATE TABLE t2(f1 INT NOT NULL PRIMARY KEY,
+f2 INT NOT NULL)ENGINE=InnoDB;
+ALTER TABLE t2 ADD CONSTRAINT FOREIGN KEY(f1) REFERENCES t1(f1);
+affected rows: 0
+info: Records: 0  Duplicates: 0  Warnings: 0
+INSERT INTO t1 VALUES (1, 1);
+INSERT INTO t2 VALUES (1, 2);
+ALTER TABLE t2 ADD CONSTRAINT FOREIGN KEY(f2) REFERENCES t1(f1);
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`#sql-alter`, CONSTRAINT `#sql-alter_ibfk_2` FOREIGN KEY (`f2`) REFERENCES `t1` (`f1`))
+INSERT INTO t1 VALUES(3, 1);
+SET STATEMENT foreign_key_checks=0 FOR
+ALTER TABLE t2 ALGORITHM=COPY, ADD CONSTRAINT FOREIGN KEY(f2) REFERENCES t1(f1);
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+ALTER TABLE t1 ALGORITHM=COPY, FORCE;
+affected rows: 2
+info: Records: 2  Duplicates: 0  Warnings: 0
+ALTER TABLE t2 ALGORITHM=COPY, FORCE;
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
+DROP TABLE t2, t1;

mysql-test/suite/innodb/r/log_file_size_online.result

@@ -19,8 +19,10 @@ SHOW VARIABLES LIKE 'innodb_log_file_size';
 Variable_name	Value
 innodb_log_file_size	4194304
 FOUND 1 /InnoDB: Resized log to 4\.000MiB/ in mysqld.1.err
-UPDATE t SET b='' WHERE a<10;
 SET GLOBAL innodb_log_file_size=5242880;
+connect con1,localhost,root;
+UPDATE t SET b='' WHERE a<10;
+connection default;
 SHOW VARIABLES LIKE 'innodb_log_file_size';
 Variable_name	Value
 innodb_log_file_size	5242880
@@ -28,6 +30,9 @@ SELECT global_value FROM information_schema.system_variables
 WHERE variable_name = 'innodb_log_file_size';
 global_value
 5242880
+connection con1;
+disconnect con1;
+connection default;
 # restart
 SELECT * FROM t WHERE a<10;
 a	b
@@ -40,6 +45,10 @@ a	b
 7	
 8	
 9	
+SELECT COUNT(*),LENGTH(b) FROM t GROUP BY b;
+COUNT(*)	LENGTH(b)
+9	0
+19991	255
 SHOW VARIABLES LIKE 'innodb_log_file_size';
 Variable_name	Value
 innodb_log_file_size	5242880

mysql-test/suite/innodb/t/alter_copy_bulk.test

@@ -1,26 +1,25 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc
 --source include/have_sequence.inc
-SET @@alter_algorithm=COPY;
 
 CREATE TABLE t1(f1 CHAR(200), f2 INT NOT NULL)engine=InnoDB;
 INSERT INTO t1 SELECT repeat('a', 200), seq FROM seq_1_to_2;
 # Buffer fits in the memory
-ALTER TABLE t1 FORCE;
+ALTER TABLE t1 ALGORITHM=COPY, FORCE;
 
 # Insert more entries
 INSERT INTO t1 SELECT repeat('b', 200), seq FROM seq_3_to_65536;
 # Alter should use temporary file for sorting
-ALTER TABLE t1 ADD INDEX(f2);
+ALTER TABLE t1 ALGORITHM=COPY, ADD INDEX(f2);
 
 # Error while buffering the insert operation
 --error ER_DUP_ENTRY
-ALTER TABLE t1 ADD PRIMARY KEY(f1(2));
+ALTER TABLE t1 ALGORITHM=COPY, ADD PRIMARY KEY(f1(2));
 
 INSERT INTO t1 VALUES(repeat('a', 200), 1);
 # Error while applying the bulk insert operation
 --error ER_DUP_ENTRY
-ALTER TABLE t1 ADD UNIQUE KEY(f2);
+ALTER TABLE t1 ALGORITHM=COPY, ADD UNIQUE KEY(f2);
 
 # Ignore shouldn't go through bulk operation
 ALTER IGNORE TABLE t1 MODIFY f1 CHAR(200) NOT NULL;
@@ -29,16 +28,41 @@ CREATE TABLE t2(f1 INT NOT NULL,
 		FOREIGN KEY(f1) REFERENCES t1(f2))ENGINE=InnoDB;
 INSERT INTO t2 VALUES(1);
 # Bulk operation shouldn't happen because of foreign key constraints
-ALTER TABLE t2 FORCE;
+ALTER TABLE t2 ALGORITHM=COPY, FORCE;
 DROP TABLE t2, t1;
 
 CREATE TABLE t1 (f1 INT, f2 INT) ENGINE=InnoDB PARTITION BY HASH(f1) PARTITIONS 2;
 INSERT INTO t1 VALUES(1, 1);
 INSERT INTO t1 SELECT seq, seq * 2 FROM seq_1_to_2;
 # Buffer fits in the memory
-ALTER TABLE t1 FORCE;
+ALTER TABLE t1 ALGORITHM=COPY, FORCE;
 # Insert more entries
 INSERT INTO t1 SELECT seq, seq * 2 FROM seq_3_to_65536;
 # Alter should use temporary file for sorting
-ALTER TABLE t1 ADD INDEX(f2);
+ALTER TABLE t1 ALGORITHM=COPY, ADD INDEX(f2);
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-34756 Validation of new foreign key skipped
+--echo #            if innodb_alter_copy_bulk=ON
+--echo #
+CREATE TABLE t1(f1 INT NOT NULL PRIMARY KEY,
+		f2 INT NOT NULL)ENGINE=InnoDB;
+CREATE TABLE t2(f1 INT NOT NULL PRIMARY KEY,
+		f2 INT NOT NULL)ENGINE=InnoDB;
+--enable_info
+ALTER TABLE t2 ADD CONSTRAINT FOREIGN KEY(f1) REFERENCES t1(f1);
+--disable_info
+INSERT INTO t1 VALUES (1, 1);
+INSERT INTO t2 VALUES (1, 2);
+--replace_regex /#sql-alter-[0-9a-f-]*/#sql-alter/
+--error ER_NO_REFERENCED_ROW_2
+ALTER TABLE t2 ADD CONSTRAINT FOREIGN KEY(f2) REFERENCES t1(f1);
+INSERT INTO t1 VALUES(3, 1);
+--enable_info
+SET STATEMENT foreign_key_checks=0 FOR
+ALTER TABLE t2 ALGORITHM=COPY, ADD CONSTRAINT FOREIGN KEY(f2) REFERENCES t1(f1);
+ALTER TABLE t1 ALGORITHM=COPY, FORCE;
+ALTER TABLE t2 ALGORITHM=COPY, FORCE;
+--disable_info
+DROP TABLE t2, t1;

mysql-test/suite/innodb/t/log_file_size_online.test

@@ -25,17 +25,28 @@ SHOW VARIABLES LIKE 'innodb_log_file_size';
 let SEARCH_PATTERN = InnoDB: Resized log to 4\\.000MiB;
 --source include/search_pattern_in_file.inc
 
-UPDATE t SET b='' WHERE a<10;
+send SET GLOBAL innodb_log_file_size=5242880;
 
-SET GLOBAL innodb_log_file_size=5242880;
+--connect con1,localhost,root
+send UPDATE t SET b='' WHERE a<10;
+
+--connection default
+reap;
 SHOW VARIABLES LIKE 'innodb_log_file_size';
 SELECT global_value FROM information_schema.system_variables
 WHERE variable_name = 'innodb_log_file_size';
 
+--connection con1
+reap;
+--disconnect con1
+--connection default
+
+--let $shutdown_timeout=0
 --let $restart_parameters=
 --source include/restart_mysqld.inc
 
 SELECT * FROM t WHERE a<10;
+SELECT COUNT(*),LENGTH(b) FROM t GROUP BY b;
 
 SHOW VARIABLES LIKE 'innodb_log_file_size';
 let SEARCH_PATTERN = InnoDB: Resized log to 5\\.000MiB;