Merge 10.2 into 10.3

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

@@ -129,13 +129,14 @@ INSERT INTO t1 VALUES(42);
 CREATE TABLE bug16735660 (a INT PRIMARY KEY) ENGINE=InnoDB;
 
 XA START 'x';
+--source ../include/no_checkpoint_start.inc
 INSERT INTO bug16735660 VALUES(1),(2),(3);
 XA END 'x';
 XA PREPARE 'x';
+--connection default
+--let CLEANUP_IF_CHECKPOINT=XA ROLLBACK 'x';DROP TABLE bug16735660;
+--source ../include/no_checkpoint_end.inc
 
--- connection default
-
--- source include/kill_mysqld.inc
 -- disconnect con1
 -- move_file $MYSQLD_DATADIR/test/bug16735660.ibd $MYSQLD_DATADIR/bug16735660.omg
 

storage/rocksdb/mysql-test/rocksdb/r/issue255.result

@@ -2,7 +2,7 @@ CREATE TABLE t1 (pk BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
 INSERT INTO t1 VALUES (5);
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-t1	ROCKSDB	#	Fixed	1	#	#	#	#	#	6	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
+t1	ROCKSDB	#	Fixed	#	#	#	#	#	#	6	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
 INSERT INTO t1 VALUES ('538647864786478647864');
 Warnings:
 Warning	1264	Out of range value for column 'pk' at row 1
@@ -21,7 +21,7 @@ pk
 9223372036854775807
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-t1	ROCKSDB	#	Fixed	2	#	#	#	#	#	9223372036854775807	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
+t1	ROCKSDB	#	Fixed	#	#	#	#	#	#	9223372036854775807	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
 INSERT INTO t1 VALUES ();
 ERROR 23000: Duplicate entry '9223372036854775807' for key 'PRIMARY'
 SELECT * FROM t1;
@@ -30,13 +30,13 @@ pk
 9223372036854775807
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-t1	ROCKSDB	#	Fixed	2	#	#	#	#	#	9223372036854775807	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
+t1	ROCKSDB	#	Fixed	#	#	#	#	#	#	9223372036854775807	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
 DROP TABLE t1;
 CREATE TABLE t1 (pk TINYINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
 INSERT INTO t1 VALUES (5);
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-t1	ROCKSDB	#	Fixed	1	#	#	#	#	#	6	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
+t1	ROCKSDB	#	Fixed	#	#	#	#	#	#	6	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
 INSERT INTO t1 VALUES (1000);
 Warnings:
 Warning	1264	Out of range value for column 'pk' at row 1
@@ -46,7 +46,7 @@ pk
 127
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-t1	ROCKSDB	#	Fixed	2	#	#	#	#	#	127	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
+t1	ROCKSDB	#	Fixed	#	#	#	#	#	#	127	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
 INSERT INTO t1 VALUES ();
 ERROR 23000: Duplicate entry '127' for key 'PRIMARY'
 SELECT * FROM t1;
@@ -55,7 +55,7 @@ pk
 127
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-t1	ROCKSDB	#	Fixed	2	#	#	#	#	#	127	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
+t1	ROCKSDB	#	Fixed	#	#	#	#	#	#	127	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
 INSERT INTO t1 VALUES ();
 ERROR 23000: Duplicate entry '127' for key 'PRIMARY'
 SELECT * FROM t1;
@@ -64,5 +64,5 @@ pk
 127
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment	Max_index_length	Temporary
-t1	ROCKSDB	#	Fixed	2	#	#	#	#	#	127	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
+t1	ROCKSDB	#	Fixed	#	#	#	#	#	#	127	NULL	NULL	NULL	latin1_swedish_ci	NULL			0	N
 DROP TABLE t1;

storage/rocksdb/mysql-test/rocksdb/t/issue255.test

@@ -3,24 +3,24 @@
 CREATE TABLE t1 (pk BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
 
 INSERT INTO t1 VALUES (5);
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SHOW TABLE STATUS LIKE 't1';
 
 INSERT INTO t1 VALUES ('538647864786478647864');
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SELECT * FROM t1;
 SHOW TABLE STATUS LIKE 't1';
 
 --error ER_DUP_ENTRY
 INSERT INTO t1 VALUES ();
 SELECT * FROM t1;
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SHOW TABLE STATUS LIKE 't1';
 
 --error ER_DUP_ENTRY
 INSERT INTO t1 VALUES ();
 SELECT * FROM t1;
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SHOW TABLE STATUS LIKE 't1';
 
 DROP TABLE t1;
@@ -28,24 +28,24 @@ DROP TABLE t1;
 CREATE TABLE t1 (pk TINYINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
 
 INSERT INTO t1 VALUES (5);
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SHOW TABLE STATUS LIKE 't1';
 
 INSERT INTO t1 VALUES (1000);
 SELECT * FROM t1;
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SHOW TABLE STATUS LIKE 't1';
 
 --error ER_DUP_ENTRY
 INSERT INTO t1 VALUES ();
 SELECT * FROM t1;
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SHOW TABLE STATUS LIKE 't1';
 
 --error ER_DUP_ENTRY
 INSERT INTO t1 VALUES ();
 SELECT * FROM t1;
---replace_column 3 # 6 # 7 # 8 # 9 # 10 #
+--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
 SHOW TABLE STATUS LIKE 't1';
 
 DROP TABLE t1;