database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

don't use normal diffs in *.rdiff files

Browse Source 
they aren't robust enough and can easily apply incorrectly

(this fixes the failure of innodb.insert_into_empty,4k after the merge)
This commit is contained in:
Sergei Golubchik
2024-04-30 12:30:48 +02:00
parent 0aae11ac28
commit b663c935a4
6 changed files with 308 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
mysql-test/suite/innodb/r/alter_not_null,COPY,NON-STRICT.rdiff
View File

@@ -1,42 +1,79 @@
7,8c7,8 --- alter_not_null.result
< affected rows: 0 +++ alter_not_null,COPY,NON-STRICT.result~
< info: Records: 0 Duplicates: 0 Warnings: 1 @@ -4,8 +4,8 @@
--- f1
> affected rows: 1 NULL
> info: Records: 1 Duplicates: 0 Warnings: 1 ALTER TABLE t1 CHANGE f1 f1 INT NOT NULL;
21,22c21,22 -affected rows: 0
< affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 1
< info: Records: 0 Duplicates: 0 Warnings: 1 +affected rows: 1
--- +info: Records: 1 Duplicates: 0 Warnings: 1
> affected rows: 1 Warnings:
> info: Records: 1 Duplicates: 0 Warnings: 1 Warning 1265 Data truncated for column 'f1' at row 1
35,36c35,36 SELECT * FROM t1;
< affected rows: 0 @@ -18,8 +18,8 @@
< info: Records: 0 Duplicates: 0 Warnings: 1 f1
--- NULL
> affected rows: 1 ALTER TABLE t1 CHANGE f1 f1 CHAR(10) NOT NULL;
> info: Records: 1 Duplicates: 0 Warnings: 1 -affected rows: 0
49,50c49,50 -info: Records: 0 Duplicates: 0 Warnings: 1
< affected rows: 0 +affected rows: 1
< info: Records: 0 Duplicates: 0 Warnings: 1 +info: Records: 1 Duplicates: 0 Warnings: 1
--- Warnings:
> affected rows: 1 Warning 1265 Data truncated for column 'f1' at row 1
> info: Records: 1 Duplicates: 0 Warnings: 1 SELECT * FROM t1;
63,64c63,64 @@ -32,8 +32,8 @@
< affected rows: 0 f1
< info: Records: 0 Duplicates: 0 Warnings: 1 NULL
--- ALTER TABLE t1 CHANGE f1 f1 VARCHAR(20) NOT NULL;
> affected rows: 1 -affected rows: 0
> info: Records: 1 Duplicates: 0 Warnings: 1 -info: Records: 0 Duplicates: 0 Warnings: 1
77,78c77,78 +affected rows: 1
< affected rows: 0 +info: Records: 1 Duplicates: 0 Warnings: 1
< info: Records: 0 Duplicates: 0 Warnings: 1 Warnings:
--- Warning 1265 Data truncated for column 'f1' at row 1
> affected rows: 1 SELECT * FROM t1;
> info: Records: 1 Duplicates: 0 Warnings: 1 @@ -46,8 +46,8 @@
98,99c98,99 f1
< affected rows: 0 NULL
< info: Records: 0 Duplicates: 0 Warnings: 1 ALTER TABLE t1 CHANGE f1 f1 TEXT NOT NULL DEFAULT 'abc';
--- -affected rows: 0
> affected rows: 1 -info: Records: 0 Duplicates: 0 Warnings: 1
> info: Records: 1 Duplicates: 0 Warnings: 1 +affected rows: 1
+info: Records: 1 Duplicates: 0 Warnings: 1
Warnings:
Warning 1265 Data truncated for column 'f1' at row 1
SELECT * FROM t1;
@@ -60,8 +60,8 @@
f1 f2 f3
2 2 NULL
ALTER TABLE t1 CHANGE f3 f3 INT NOT NULL DEFAULT (f1 + f2);
-affected rows: 0
-info: Records: 0 Duplicates: 0 Warnings: 1
+affected rows: 1
+info: Records: 1 Duplicates: 0 Warnings: 1
Warnings:
Warning 1265 Data truncated for column 'f3' at row 1
SELECT * FROM t1;
@@ -74,8 +74,8 @@
f1 b
10 NULL
ALTER TABLE t1 CHANGE b b TINYINT NOT NULL DEFAULT if(unix_timestamp()>1,1000,0);
-affected rows: 0
-info: Records: 0 Duplicates: 0 Warnings: 1
+affected rows: 1
+info: Records: 1 Duplicates: 0 Warnings: 1
Warnings:
Warning 1265 Data truncated for column 'b' at row 1
SELECT * FROM t1;
@@ -95,8 +95,8 @@
CREATE TABLE t1(c1 INT NOT NULL, c2 INT, PRIMARY KEY(c1))ENGINE=INNODB;
INSERT INTO t1 VALUES(1, NULL);
ALTER IGNORE TABLE t1 CHANGE c2 c2 INT NOT NULL DEFAULT 2;
-affected rows: 0
-info: Records: 0 Duplicates: 0 Warnings: 1
+affected rows: 1
+info: Records: 1 Duplicates: 0 Warnings: 1
Warnings:
Warning 1265 Data truncated for column 'c2' at row 1
SELECT * FROM t1;

181
mysql-test/suite/innodb/r/alter_not_null,COPY,STRICT.rdiff
View File

@@ -1,72 +1,109 @@
7,10c7 --- alter_not_null.result
< affected rows: 0 +++ alter_not_null,COPY,STRICT.result~
< info: Records: 0 Duplicates: 0 Warnings: 1 @@ -4,13 +4,10 @@
< Warnings: f1
< Warning 1265 Data truncated for column 'f1' at row 1 NULL
--- ALTER TABLE t1 CHANGE f1 f1 INT NOT NULL;
> ERROR 01000: Data truncated for column 'f1' at row 1 -affected rows: 0
13c10 -info: Records: 0 Duplicates: 0 Warnings: 1
< 0 -Warnings:
--- -Warning 1265 Data truncated for column 'f1' at row 1
> NULL +ERROR 01000: Data truncated for column 'f1' at row 1
21,24c18 SELECT * FROM t1;
< affected rows: 0 f1
< info: Records: 0 Duplicates: 0 Warnings: 1 -0
< Warnings: +NULL
< Warning 1265 Data truncated for column 'f1' at row 1 DROP TABLE t1;
--- CREATE TABLE t1(f1 CHAR(10))ENGINE=INNODB;
> ERROR 01000: Data truncated for column 'f1' at row 1 INSERT INTO t1 VALUES(NULL);
27c21 @@ -18,13 +15,10 @@
< f1
--- NULL
> NULL ALTER TABLE t1 CHANGE f1 f1 CHAR(10) NOT NULL;
35,38c29 -affected rows: 0
< affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 1
< info: Records: 0 Duplicates: 0 Warnings: 1 -Warnings:
< Warnings: -Warning 1265 Data truncated for column 'f1' at row 1
< Warning 1265 Data truncated for column 'f1' at row 1 +ERROR 01000: Data truncated for column 'f1' at row 1
--- SELECT * FROM t1;
> ERROR 01000: Data truncated for column 'f1' at row 1 f1
41c32 -
< +NULL
--- DROP TABLE t1;
> NULL CREATE TABLE t1(f1 VARCHAR(10))ENGINE=INNODB;
49,52c40 INSERT INTO t1 VALUES(NULL);
< affected rows: 0 @@ -32,13 +26,10 @@
< info: Records: 0 Duplicates: 0 Warnings: 1 f1
< Warnings: NULL
< Warning 1265 Data truncated for column 'f1' at row 1 ALTER TABLE t1 CHANGE f1 f1 VARCHAR(20) NOT NULL;
--- -affected rows: 0
> ERROR 01000: Data truncated for column 'f1' at row 1 -info: Records: 0 Duplicates: 0 Warnings: 1
55c43 -Warnings:
< -Warning 1265 Data truncated for column 'f1' at row 1
--- +ERROR 01000: Data truncated for column 'f1' at row 1
> NULL SELECT * FROM t1;
63,66c51 f1
< affected rows: 0 -
< info: Records: 0 Duplicates: 0 Warnings: 1 +NULL
< Warnings: DROP TABLE t1;
< Warning 1265 Data truncated for column 'f3' at row 1 CREATE TABLE t1(f1 TEXT)ENGINE=INNODB;
--- INSERT INTO t1 VALUES(NULL);
> ERROR 01000: Data truncated for column 'f3' at row 1 @@ -46,13 +37,10 @@
69c54 f1
< 2 2 0 NULL
--- ALTER TABLE t1 CHANGE f1 f1 TEXT NOT NULL DEFAULT 'abc';
> 2 2 NULL -affected rows: 0
77,80c62 -info: Records: 0 Duplicates: 0 Warnings: 1
< affected rows: 0 -Warnings:
< info: Records: 0 Duplicates: 0 Warnings: 1 -Warning 1265 Data truncated for column 'f1' at row 1
< Warnings: +ERROR 01000: Data truncated for column 'f1' at row 1
< Warning 1265 Data truncated for column 'b' at row 1 SELECT * FROM t1;
--- f1
> ERROR 01000: Data truncated for column 'b' at row 1 -
83c65 +NULL
< 10 0 DROP TABLE t1;
--- CREATE TABLE t1(f1 INT NOT NULL, f2 INT NOT NULL, f3 INT)ENGINE=INNODB;
> 10 NULL INSERT INTO t1 VALUES(2, 2, NULL);
98,99c80,81 @@ -60,13 +48,10 @@
< affected rows: 0 f1 f2 f3
< info: Records: 0 Duplicates: 0 Warnings: 1 2 2 NULL
--- ALTER TABLE t1 CHANGE f3 f3 INT NOT NULL DEFAULT (f1 + f2);
> affected rows: 1 -affected rows: 0
> info: Records: 1 Duplicates: 0 Warnings: 1 -info: Records: 0 Duplicates: 0 Warnings: 1
-Warnings:
-Warning 1265 Data truncated for column 'f3' at row 1
+ERROR 01000: Data truncated for column 'f3' at row 1
SELECT * FROM t1;
f1 f2 f3
-2 2 0
+2 2 NULL
DROP TABLE t1;
CREATE TABLE t1(f1 INT NOT NULL DEFAULT 0, b TINYINT)ENGINE=InnoDB;
INSERT INTO t1 VALUES(10, NULL);
@@ -74,13 +59,10 @@
f1 b
10 NULL
ALTER TABLE t1 CHANGE b b TINYINT NOT NULL DEFAULT if(unix_timestamp()>1,1000,0);
-affected rows: 0
-info: Records: 0 Duplicates: 0 Warnings: 1
-Warnings:
-Warning 1265 Data truncated for column 'b' at row 1
+ERROR 01000: Data truncated for column 'b' at row 1
SELECT * FROM t1;
f1 b
-10 0
+10 NULL
DROP TABLE t1;
CREATE TABLE t1(a INT, v INT AS (a), c INT, d INT NOT NULL, e INT) ENGINE=InnoDB;
ALTER TABLE t1 DROP COLUMN c, CHANGE COLUMN e e INT NOT NULL;
@@ -95,8 +77,8 @@
CREATE TABLE t1(c1 INT NOT NULL, c2 INT, PRIMARY KEY(c1))ENGINE=INNODB;
INSERT INTO t1 VALUES(1, NULL);
ALTER IGNORE TABLE t1 CHANGE c2 c2 INT NOT NULL DEFAULT 2;
-affected rows: 0
-info: Records: 0 Duplicates: 0 Warnings: 1
+affected rows: 1
+info: Records: 1 Duplicates: 0 Warnings: 1
Warnings:
Warning 1265 Data truncated for column 'c2' at row 1
SELECT * FROM t1;

164
mysql-test/suite/innodb/r/alter_not_null,INPLACE,STRICT.rdiff
View File

@@ -1,66 +1,98 @@
7,10c7 --- alter_not_null.result
< affected rows: 0 +++ alter_not_null,INPLACE,STRICT.result~
< info: Records: 0 Duplicates: 0 Warnings: 1 @@ -4,13 +4,10 @@
< Warnings: f1
< Warning 1265 Data truncated for column 'f1' at row 1 NULL
--- ALTER TABLE t1 CHANGE f1 f1 INT NOT NULL;
> ERROR 01000: Data truncated for column 'f1' at row 1 -affected rows: 0
13c10 -info: Records: 0 Duplicates: 0 Warnings: 1
< 0 -Warnings:
--- -Warning 1265 Data truncated for column 'f1' at row 1
> NULL +ERROR 01000: Data truncated for column 'f1' at row 1
21,24c18 SELECT * FROM t1;
< affected rows: 0 f1
< info: Records: 0 Duplicates: 0 Warnings: 1 -0
< Warnings: +NULL
< Warning 1265 Data truncated for column 'f1' at row 1 DROP TABLE t1;
--- CREATE TABLE t1(f1 CHAR(10))ENGINE=INNODB;
> ERROR 01000: Data truncated for column 'f1' at row 1 INSERT INTO t1 VALUES(NULL);
27c21 @@ -18,13 +15,10 @@
< f1
--- NULL
> NULL ALTER TABLE t1 CHANGE f1 f1 CHAR(10) NOT NULL;
35,38c29 -affected rows: 0
< affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 1
< info: Records: 0 Duplicates: 0 Warnings: 1 -Warnings:
< Warnings: -Warning 1265 Data truncated for column 'f1' at row 1
< Warning 1265 Data truncated for column 'f1' at row 1 +ERROR 01000: Data truncated for column 'f1' at row 1
--- SELECT * FROM t1;
> ERROR 01000: Data truncated for column 'f1' at row 1 f1
41c32 -
< +NULL
--- DROP TABLE t1;
> NULL CREATE TABLE t1(f1 VARCHAR(10))ENGINE=INNODB;
49,52c40 INSERT INTO t1 VALUES(NULL);
< affected rows: 0 @@ -32,13 +26,10 @@
< info: Records: 0 Duplicates: 0 Warnings: 1 f1
< Warnings: NULL
< Warning 1265 Data truncated for column 'f1' at row 1 ALTER TABLE t1 CHANGE f1 f1 VARCHAR(20) NOT NULL;
--- -affected rows: 0
> ERROR 01000: Data truncated for column 'f1' at row 1 -info: Records: 0 Duplicates: 0 Warnings: 1
55c43 -Warnings:
< -Warning 1265 Data truncated for column 'f1' at row 1
--- +ERROR 01000: Data truncated for column 'f1' at row 1
> NULL SELECT * FROM t1;
63,66c51 f1
< affected rows: 0 -
< info: Records: 0 Duplicates: 0 Warnings: 1 +NULL
< Warnings: DROP TABLE t1;
< Warning 1265 Data truncated for column 'f3' at row 1 CREATE TABLE t1(f1 TEXT)ENGINE=INNODB;
--- INSERT INTO t1 VALUES(NULL);
> ERROR 01000: Data truncated for column 'f3' at row 1 @@ -46,13 +37,10 @@
69c54 f1
< 2 2 0 NULL
--- ALTER TABLE t1 CHANGE f1 f1 TEXT NOT NULL DEFAULT 'abc';
> 2 2 NULL -affected rows: 0
77,80c62 -info: Records: 0 Duplicates: 0 Warnings: 1
< affected rows: 0 -Warnings:
< info: Records: 0 Duplicates: 0 Warnings: 1 -Warning 1265 Data truncated for column 'f1' at row 1
< Warnings: +ERROR 01000: Data truncated for column 'f1' at row 1
< Warning 1265 Data truncated for column 'b' at row 1 SELECT * FROM t1;
--- f1
> ERROR 01000: Data truncated for column 'b' at row 1 -
83c65 +NULL
< 10 0 DROP TABLE t1;
--- CREATE TABLE t1(f1 INT NOT NULL, f2 INT NOT NULL, f3 INT)ENGINE=INNODB;
> 10 NULL INSERT INTO t1 VALUES(2, 2, NULL);
@@ -60,13 +48,10 @@
f1 f2 f3
2 2 NULL
ALTER TABLE t1 CHANGE f3 f3 INT NOT NULL DEFAULT (f1 + f2);
-affected rows: 0
-info: Records: 0 Duplicates: 0 Warnings: 1
-Warnings:
-Warning 1265 Data truncated for column 'f3' at row 1
+ERROR 01000: Data truncated for column 'f3' at row 1
SELECT * FROM t1;
f1 f2 f3
-2 2 0
+2 2 NULL
DROP TABLE t1;
CREATE TABLE t1(f1 INT NOT NULL DEFAULT 0, b TINYINT)ENGINE=InnoDB;
INSERT INTO t1 VALUES(10, NULL);
@@ -74,13 +59,10 @@
f1 b
10 NULL
ALTER TABLE t1 CHANGE b b TINYINT NOT NULL DEFAULT if(unix_timestamp()>1,1000,0);
-affected rows: 0
-info: Records: 0 Duplicates: 0 Warnings: 1
-Warnings:
-Warning 1265 Data truncated for column 'b' at row 1
+ERROR 01000: Data truncated for column 'b' at row 1
SELECT * FROM t1;
f1 b
-10 0
+10 NULL
DROP TABLE t1;
CREATE TABLE t1(a INT, v INT AS (a), c INT, d INT NOT NULL, e INT) ENGINE=InnoDB;
ALTER TABLE t1 DROP COLUMN c, CHANGE COLUMN e e INT NOT NULL;

5
mysql-test/suite/innodb/r/innodb-wl5522,crc32.rdiff
View File

@@ -1,5 +0,0 @@
120,121c120
< Warnings:
< Warning 1810 IO Read error: (2, No such file or directory) Error opening './test/t2.cfg', will attempt to import without schema verification
---
> ERROR HY000: Schema mismatch (Expected FSP_SPACE_FLAGS=0x*, .ibd file contains 0x*.)

17
mysql-test/suite/innodb/r/innodb-wl5522,strict_crc32.rdiff
View File

@@ -1,5 +1,12 @@
120,121c120 --- innodb-wl5522.result
< Warnings: +++ innodb-wl5522,strict_crc32.result~
< Warning 1810 IO Read error: (2, No such file or directory) Error opening './test/t2.cfg', will attempt to import without schema verification @@ -131,8 +131,7 @@
--- ALTER TABLE t2 IMPORT TABLESPACE;
> ERROR HY000: Schema mismatch (Expected FSP_SPACE_FLAGS=0x*, .ibd file contains 0x*.) ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x1; .cfg file uses ROW_FORMAT=COMPACT)
ALTER TABLE t2 IMPORT TABLESPACE;
-Warnings:
-Warning 1810 IO Read error: (2, No such file or directory) Error opening './test/t2.cfg', will attempt to import without schema verification
+ERROR HY000: Schema mismatch (Expected FSP_SPACE_FLAGS=0x*, .ibd file contains 0x*.)
DROP TABLE t2;
SET GLOBAL innodb_file_per_table = 1;
SELECT @@innodb_file_per_table;

12
mysql-test/suite/innodb/r/insert_into_empty,4k.rdiff
View File

@@ -1,2 +1,10 @@
423a424 --- a/mysql-test/suite/innodb/r/insert_into_empty.result
> ERROR 42000: Row size too large (> 1982). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline. +++ b/mysql-test/suite/innodb/r/insert_into_empty.result
@@ -430,6 +430,7 @@
INSERT IGNORE INTO t1 VALUES
(1, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107)),
(2, REPEAT('x',4805), REPEAT('t',2211), REPEAT('u',974), REPEAT('e',871), REPEAT('z',224), REPEAT('j',978), REPEAT('n',190), REPEAT('t',888), REPEAT('x',32768), REPEAT('e',968), REPEAT('b',913), REPEAT('x',12107));
+ERROR 42000: Row size too large (> 1982). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK