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

Merge branch '11.0' into 11.1

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-19 20:11:54 +01:00
parent fa2e1c3948 8c8bce05d2
commit 7a5448f8da
672 changed files with 27790 additions and 5130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,15 +10,19 @@
+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("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 @@
call mtr.add_suppression("Table `test`.`t1` is corrupted. Please drop the table and recreate");
@@ -16,12 +16,12 @@
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 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
ERROR 42S02: Table 'test.t1' doesn't exist in engine
show warnings;
Level Code Message
-Warning 4185 MariaDB tried to use the BZip2 compression, but its provider plugin is not loaded
+Warning 4185 MariaDB tried to use the LZ4 compression, but its provider plugin is not loaded
Error 1932 Table 'test.t1' doesn't exist in engine
drop table t1;
# restart

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

@@ -10,15 +10,19 @@
+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("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 @@
call mtr.add_suppression("Table `test`.`t1` is corrupted. Please drop the table and recreate");
@@ -16,12 +16,12 @@
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 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
ERROR 42S02: Table 'test.t1' doesn't exist in engine
show warnings;
Level Code Message
-Warning 4185 MariaDB tried to use the BZip2 compression, but its provider plugin is not loaded
+Warning 4185 MariaDB tried to use the LZMA compression, but its provider plugin is not loaded
Error 1932 Table 'test.t1' doesn't exist in engine
drop table t1;
# restart

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

@@ -10,15 +10,19 @@
+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("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 @@
call mtr.add_suppression("Table `test`.`t1` is corrupted. Please drop the table and recreate");
@@ -16,12 +16,12 @@
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 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
ERROR 42S02: Table 'test.t1' doesn't exist in engine
show warnings;
Level Code Message
-Warning 4185 MariaDB tried to use the BZip2 compression, but its provider plugin is not loaded
+Warning 4185 MariaDB tried to use the LZO compression, but its provider plugin is not loaded
Error 1932 Table 'test.t1' doesn't exist in engine
drop table t1;
# restart

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

@@ -10,15 +10,19 @@
+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("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 @@
call mtr.add_suppression("Table `test`.`t1` is corrupted. Please drop the table and recreate");
@@ -16,12 +16,12 @@
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 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
ERROR 42S02: Table 'test.t1' doesn't exist in engine
show warnings;
Level Code Message
-Warning 4185 MariaDB tried to use the BZip2 compression, but its provider plugin is not loaded
+Warning 4185 MariaDB tried to use the Snappy compression, but its provider plugin is not loaded
Error 1932 Table 'test.t1' doesn't exist in engine
drop table t1;
# restart

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

@@ -1,6 +1,6 @@
--- suite/plugins/r/compression.result
+++ suite/plugins/r/compression.reject
@@ -1,12 +1,8 @@
@@ -1,13 +1,8 @@
#
-# Testing bzip2 compression provider with innodb
+# Testing lz4 compression provider with mroonga
@@ -9,20 +9,25 @@
-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("Table `test`.`t1` is corrupted. Please drop the table and recreate");
-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));
insert t1 (a, b) values (1, repeat("def", 1000));
insert t1 (a, b) values (2, repeat("ghi", 10000));
@@ -14,8 +11,20 @@
@@ -16,12 +11,20 @@
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 HY000: Table test/t1 is compressed with bzip2, which is not currently loaded. Please load the bzip2 provider plugin to open the table
-ERROR 42S02: Table 'test.t1' doesn't exist in engine
-show warnings;
-Level Code Message
-Warning 4185 MariaDB tried to use the BZip2 compression, but its provider plugin is not loaded
-Error 1932 Table 'test.t1' doesn't exist in engine
+a left(b, 9) length(b)
+0 0
+1 0

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

@@ -5,6 +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("Table `test`.`t1` is corrupted. Please drop the table and recreate");
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));
@@ -17,6 +18,10 @@ a left(b, 9) length(b)
2 ghighighi 30000
# restart: --disable-provider-bzip2
select a, left(b, 9), length(b) from t1;
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 42S02: Table 'test.t1' doesn't exist in engine
show warnings;
Level Code Message
Warning 4185 MariaDB tried to use the BZip2 compression, but its provider plugin is not loaded
Error 1932 Table 'test.t1' doesn't exist in engine
drop table t1;
# restart

2
mysql-test/suite/plugins/r/test_sql_service.result
View File

@@ -1,8 +1,8 @@
reset master;
install plugin test_sql_service soname 'test_sql_service';
show status like 'test_sql_service_passed';
Variable_name Value
Test_sql_service_passed 1
reset master;
set global test_sql_service_execute_sql_global= 'create table test.t1 select 1 as a, @@SQL_LOG_BIN';
set global test_sql_service_execute_sql_local= 'insert into test.t1 select 2 as a, @@SQL_LOG_BIN';
set global test_sql_service_execute_sql_global= 'SET SQL_LOG_BIN=1';

5
mysql-test/suite/plugins/t/compression.combinations
View File

@@ -1,25 +1,30 @@
[innodb-bzip2]
innodb
innodb-fast-shutdown=0
plugin-load-add=$PROVIDER_BZIP2_SO
loose-provider-bzip2
[innodb-lz4]
innodb
innodb-fast-shutdown=0
plugin-load-add=$PROVIDER_LZ4_SO
loose-provider-lz4
[innodb-lzma]
innodb
innodb-fast-shutdown=0
plugin-load-add=$PROVIDER_LZMA_SO
loose-provider-lzma
[innodb-lzo]
innodb
innodb-fast-shutdown=0
plugin-load-add=$PROVIDER_LZO_SO
loose-provider-lzo
[innodb-snappy]
innodb
innodb-fast-shutdown=0
plugin-load-add=$PROVIDER_SNAPPY_SO
loose-provider-snappy

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

@@ -21,6 +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("Table `test`.`t1` is corrupted. Please drop the table and recreate");
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") {
@@ -39,8 +40,9 @@ let $restart_parameters = --disable-provider-$alg;
source include/restart_mysqld.inc;
if ($engine == "innodb") {
error ER_PROVIDER_NOT_LOADED;
error ER_NO_SUCH_TABLE_IN_ENGINE;
select a, left(b, 9), length(b) from t1;
show warnings;
}
if ($engine == "mroonga"){
select a, left(b, 9), length(b) from t1;

8
mysql-test/suite/plugins/t/test_sql_service.test
View File

@@ -1,8 +1,6 @@
--source include/not_embedded.inc
--source include/have_log_bin.inc
reset master; # clear binlogs
if (!$TEST_SQL_SERVICE_SO) {
skip No TEST_SQL_SERVICE plugin;
}
@@ -13,6 +11,7 @@ source include/wait_until_count_sessions.inc;
install plugin test_sql_service soname 'test_sql_service';
show status like 'test_sql_service_passed';
reset master;
set global test_sql_service_execute_sql_global= 'create table test.t1 select 1 as a, @@SQL_LOG_BIN';
set global test_sql_service_execute_sql_local= 'insert into test.t1 select 2 as a, @@SQL_LOG_BIN';
@@ -76,8 +75,7 @@ drop table t1;
uninstall plugin test_sql_service;
# Check that statements were executed/binlogged in correct order.
source include/show_binlog_events.inc;
--source include/show_binlog_events.inc
# --replace_column 2 # 5 #
# --replace_regex /xid=[0-9]+/xid=XX/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/
# SHOW BINLOG EVENTS LIMIT 3,100;
# SHOW BINLOG EVENTS LIMIT 3,5;