Skip to content

Commit 61b32df

Browse files
dr-mdr-m
committed
Merge 10.2 into 10.3
2 parents 2610c26 + 00b6c7d commit 61b32df

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,14 @@ INSERT INTO t1 VALUES(42);
129129
CREATE TABLE bug16735660 (a INT PRIMARY KEY) ENGINE=InnoDB;
130130

131131
XA START 'x';
132+
--source ../include/no_checkpoint_start.inc
132133
INSERT INTO bug16735660 VALUES(1),(2),(3);
133134
XA END 'x';
134135
XA PREPARE 'x';
136+
--connection default
137+
--let CLEANUP_IF_CHECKPOINT=XA ROLLBACK 'x';DROP TABLE bug16735660;
138+
--source ../include/no_checkpoint_end.inc
135139

136-
-- connection default
137-
138-
-- source include/kill_mysqld.inc
139140
-- disconnect con1
140141
-- move_file $MYSQLD_DATADIR/test/bug16735660.ibd $MYSQLD_DATADIR/bug16735660.omg
141142

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CREATE TABLE t1 (pk BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
22
INSERT INTO t1 VALUES (5);
33
SHOW TABLE STATUS LIKE 't1';
44
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
5-
t1 ROCKSDB # Fixed 1 # # # # # 6 NULL NULL NULL latin1_swedish_ci NULL 0 N
5+
t1 ROCKSDB # Fixed # # # # # # 6 NULL NULL NULL latin1_swedish_ci NULL 0 N
66
INSERT INTO t1 VALUES ('538647864786478647864');
77
Warnings:
88
Warning 1264 Out of range value for column 'pk' at row 1
@@ -21,7 +21,7 @@ pk
2121
9223372036854775807
2222
SHOW TABLE STATUS LIKE 't1';
2323
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
24-
t1 ROCKSDB # Fixed 2 # # # # # 9223372036854775807 NULL NULL NULL latin1_swedish_ci NULL 0 N
24+
t1 ROCKSDB # Fixed # # # # # # 9223372036854775807 NULL NULL NULL latin1_swedish_ci NULL 0 N
2525
INSERT INTO t1 VALUES ();
2626
ERROR 23000: Duplicate entry '9223372036854775807' for key 'PRIMARY'
2727
SELECT * FROM t1;
@@ -30,13 +30,13 @@ pk
3030
9223372036854775807
3131
SHOW TABLE STATUS LIKE 't1';
3232
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
33-
t1 ROCKSDB # Fixed 2 # # # # # 9223372036854775807 NULL NULL NULL latin1_swedish_ci NULL 0 N
33+
t1 ROCKSDB # Fixed # # # # # # 9223372036854775807 NULL NULL NULL latin1_swedish_ci NULL 0 N
3434
DROP TABLE t1;
3535
CREATE TABLE t1 (pk TINYINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
3636
INSERT INTO t1 VALUES (5);
3737
SHOW TABLE STATUS LIKE 't1';
3838
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
39-
t1 ROCKSDB # Fixed 1 # # # # # 6 NULL NULL NULL latin1_swedish_ci NULL 0 N
39+
t1 ROCKSDB # Fixed # # # # # # 6 NULL NULL NULL latin1_swedish_ci NULL 0 N
4040
INSERT INTO t1 VALUES (1000);
4141
Warnings:
4242
Warning 1264 Out of range value for column 'pk' at row 1
@@ -46,7 +46,7 @@ pk
4646
127
4747
SHOW TABLE STATUS LIKE 't1';
4848
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
49-
t1 ROCKSDB # Fixed 2 # # # # # 127 NULL NULL NULL latin1_swedish_ci NULL 0 N
49+
t1 ROCKSDB # Fixed # # # # # # 127 NULL NULL NULL latin1_swedish_ci NULL 0 N
5050
INSERT INTO t1 VALUES ();
5151
ERROR 23000: Duplicate entry '127' for key 'PRIMARY'
5252
SELECT * FROM t1;
@@ -55,7 +55,7 @@ pk
5555
127
5656
SHOW TABLE STATUS LIKE 't1';
5757
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
58-
t1 ROCKSDB # Fixed 2 # # # # # 127 NULL NULL NULL latin1_swedish_ci NULL 0 N
58+
t1 ROCKSDB # Fixed # # # # # # 127 NULL NULL NULL latin1_swedish_ci NULL 0 N
5959
INSERT INTO t1 VALUES ();
6060
ERROR 23000: Duplicate entry '127' for key 'PRIMARY'
6161
SELECT * FROM t1;
@@ -64,5 +64,5 @@ pk
6464
127
6565
SHOW TABLE STATUS LIKE 't1';
6666
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
67-
t1 ROCKSDB # Fixed 2 # # # # # 127 NULL NULL NULL latin1_swedish_ci NULL 0 N
67+
t1 ROCKSDB # Fixed # # # # # # 127 NULL NULL NULL latin1_swedish_ci NULL 0 N
6868
DROP TABLE t1;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,49 @@
33
CREATE TABLE t1 (pk BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
44

55
INSERT INTO t1 VALUES (5);
6-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
6+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
77
SHOW TABLE STATUS LIKE 't1';
88

99
INSERT INTO t1 VALUES ('538647864786478647864');
10-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
10+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
1111
SELECT * FROM t1;
1212
SHOW TABLE STATUS LIKE 't1';
1313

1414
--error ER_DUP_ENTRY
1515
INSERT INTO t1 VALUES ();
1616
SELECT * FROM t1;
17-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
17+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
1818
SHOW TABLE STATUS LIKE 't1';
1919

2020
--error ER_DUP_ENTRY
2121
INSERT INTO t1 VALUES ();
2222
SELECT * FROM t1;
23-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
23+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
2424
SHOW TABLE STATUS LIKE 't1';
2525

2626
DROP TABLE t1;
2727

2828
CREATE TABLE t1 (pk TINYINT NOT NULL PRIMARY KEY AUTO_INCREMENT);
2929

3030
INSERT INTO t1 VALUES (5);
31-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
31+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
3232
SHOW TABLE STATUS LIKE 't1';
3333

3434
INSERT INTO t1 VALUES (1000);
3535
SELECT * FROM t1;
36-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
36+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
3737
SHOW TABLE STATUS LIKE 't1';
3838

3939
--error ER_DUP_ENTRY
4040
INSERT INTO t1 VALUES ();
4141
SELECT * FROM t1;
42-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
42+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
4343
SHOW TABLE STATUS LIKE 't1';
4444

4545
--error ER_DUP_ENTRY
4646
INSERT INTO t1 VALUES ();
4747
SELECT * FROM t1;
48-
--replace_column 3 # 6 # 7 # 8 # 9 # 10 #
48+
--replace_column 3 # 5 # 6 # 7 # 8 # 9 # 10 #
4949
SHOW TABLE STATUS LIKE 't1';
5050

5151
DROP TABLE t1;

0 commit comments

Comments
 (0)