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

InnoDB: send "corrupted" error to the user, not only to the log

Browse Source
This commit is contained in:
Sergei Golubchik
2021-10-26 14:37:16 +02:00
parent db20c77782
commit a52cd4aeda
22 changed files with 99 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/plugins/r/compression,innodb-lz4.rdiff
View File

@@ -1,6 +1,6 @@
--- suite/plugins/r/compression.result
+++ suite/plugins/r/compression.reject
@@ -1,9 +1,9 @@
@@ -1,8 +1,8 @@
#
-# Testing bzip2 compression provider with innodb
+# Testing lz4 compression provider with innodb
@@ -10,14 +10,15 @@
+set global innodb_compression_algorithm = lz4;
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@
call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
@@ -15,8 +15,8 @@
0 abcabcabc 300
1 defdefdef 3000
2 ghighighi 30000
-# restart: --disable-provider-bzip2
+# restart: --disable-provider-lz4
select a, left(b, 9), length(b) from t1;
ERROR 42S02: Table 'test.t1' doesn't exist in engine
-ERROR HY000: Table test/t1 is compressed with bzip2, which is not currently loaded. Please load the bzip2 provider plugin to open the table
+ERROR HY000: Table test/t1 is compressed with lz4, which is not currently loaded. Please load the lz4 provider plugin to open the table
drop table t1;
# restart

11
mysql-test/suite/plugins/r/compression,innodb-lzma.rdiff
View File

@@ -1,6 +1,6 @@
--- suite/plugins/r/compression.result
+++ suite/plugins/r/compression.reject
@@ -1,9 +1,9 @@
@@ -1,8 +1,8 @@
#
-# Testing bzip2 compression provider with innodb
+# Testing lzma compression provider with innodb
@@ -10,14 +10,15 @@
+set global innodb_compression_algorithm = lzma;
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@
call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
@@ -15,8 +15,8 @@
0 abcabcabc 300
1 defdefdef 3000
2 ghighighi 30000
-# restart: --disable-provider-bzip2
+# restart: --disable-provider-lzma
select a, left(b, 9), length(b) from t1;
ERROR 42S02: Table 'test.t1' doesn't exist in engine
-ERROR HY000: Table test/t1 is compressed with bzip2, which is not currently loaded. Please load the bzip2 provider plugin to open the table
+ERROR HY000: Table test/t1 is compressed with lzma, which is not currently loaded. Please load the lzma provider plugin to open the table
drop table t1;
# restart

11
mysql-test/suite/plugins/r/compression,innodb-lzo.rdiff
View File

@@ -1,6 +1,6 @@
--- suite/plugins/r/compression.result
+++ suite/plugins/r/compression.reject
@@ -1,9 +1,9 @@
@@ -1,8 +1,8 @@
#
-# Testing bzip2 compression provider with innodb
+# Testing lzo compression provider with innodb
@@ -10,14 +10,15 @@
+set global innodb_compression_algorithm = lzo;
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@
call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
@@ -15,8 +15,8 @@
0 abcabcabc 300
1 defdefdef 3000
2 ghighighi 30000
-# restart: --disable-provider-bzip2
+# restart: --disable-provider-lzo
select a, left(b, 9), length(b) from t1;
ERROR 42S02: Table 'test.t1' doesn't exist in engine
-ERROR HY000: Table test/t1 is compressed with bzip2, which is not currently loaded. Please load the bzip2 provider plugin to open the table
+ERROR HY000: Table test/t1 is compressed with lzo, which is not currently loaded. Please load the lzo provider plugin to open the table
drop table t1;
# restart

11
mysql-test/suite/plugins/r/compression,innodb-snappy.rdiff
View File

@@ -1,6 +1,6 @@
--- suite/plugins/r/compression.result
+++ suite/plugins/r/compression.reject
@@ -1,9 +1,9 @@
@@ -1,8 +1,8 @@
#
-# Testing bzip2 compression provider with innodb
+# Testing snappy compression provider with innodb
@@ -10,14 +10,15 @@
+set global innodb_compression_algorithm = snappy;
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+) \\(\\d\\), which is not currently loaded. Please load the '\\1' provider plugin to open the table.");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
@@ -14,7 +14,7 @@
call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
@@ -15,8 +15,8 @@
0 abcabcabc 300
1 defdefdef 3000
2 ghighighi 30000
-# restart: --disable-provider-bzip2
+# restart: --disable-provider-snappy
select a, left(b, 9), length(b) from t1;
ERROR 42S02: Table 'test.t1' doesn't exist in engine
-ERROR HY000: Table test/t1 is compressed with bzip2, which is not currently loaded. Please load the bzip2 provider plugin to open the table
+ERROR HY000: Table test/t1 is compressed with snappy, which is not currently loaded. Please load the snappy provider plugin to open the table
drop table t1;
# restart

4
mysql-test/suite/plugins/r/compression,mroonga-lz4.rdiff
View File

@@ -9,7 +9,7 @@
-set global innodb_compression_algorithm = bzip2;
-call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
-call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
-call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
-call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
-create table t1 (a int, b text ) engine = innodb page_compressed = 1;
+create table t1 (a int, b text COMMENT 'FLAGS "COLUMN_SCALAR|COMPRESS_LZ4"') engine = mroonga charset = utf8;
insert t1 (a, b) values (0, repeat("abc", 100));
@@ -22,7 +22,7 @@
-# restart: --disable-provider-bzip2
+# restart: --disable-provider-lz4
select a, left(b, 9), length(b) from t1;
-ERROR 42S02: Table 'test.t1' doesn't exist in engine
-ERROR HY000: Table test/t1 is compressed with bzip2, which is not currently loaded. Please load the bzip2 provider plugin to open the table
+a left(b, 9) length(b)
+0 0
+1 0

4
mysql-test/suite/plugins/r/compression.result
View File

@@ -5,7 +5,7 @@ call mtr.add_suppression("MariaDB tried to use the .+ compression, but its provi
set global innodb_compression_algorithm = bzip2;
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
create table t1 (a int, b text ) engine = innodb page_compressed = 1;
insert t1 (a, b) values (0, repeat("abc", 100));
insert t1 (a, b) values (1, repeat("def", 1000));
@@ -17,6 +17,6 @@ a left(b, 9) length(b)
2 ghighighi 30000
# restart: --disable-provider-bzip2
select a, left(b, 9), length(b) from t1;
ERROR 42S02: Table 'test.t1' doesn't exist in engine
ERROR HY000: Table test/t1 is compressed with bzip2, which is not currently loaded. Please load the bzip2 provider plugin to open the table
drop table t1;
# restart

4
mysql-test/suite/plugins/t/compression.test
View File

@@ -21,7 +21,7 @@ if ($engine == "innodb") {
let $table_params = page_compressed = 1;
call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
call mtr.add_suppression("InnoDB: Table `test`.`t1` is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
}
if ($engine == "mroonga") {
let $column_params = `select upper('COMMENT \'flags "COLUMN_SCALAR|COMPRESS_$alg"\'')`;
@@ -39,7 +39,7 @@ let $restart_parameters = --disable-provider-$alg;
source include/restart_mysqld.inc;
if ($engine == "innodb") {
error ER_NO_SUCH_TABLE_IN_ENGINE;
error ER_PROVIDER_NOT_LOADED;
select a, left(b, 9), length(b) from t1;
}
if ($engine == "mroonga"){