diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index b94494de9a1a..0013e6520e50 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -1069,7 +1069,7 @@ DROP TABLE t1; SET @tmp_table_size_save= @@tmp_table_size; SET @@tmp_table_size= 1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8); INSERT INTO t1 SELECT a+8 FROM t1; diff --git a/mysql-test/r/error_simulation.result b/mysql-test/r/error_simulation.result index 6a0fcccbf270..8bbd7d1b7933 100644 --- a/mysql-test/r/error_simulation.result +++ b/mysql-test/r/error_simulation.result @@ -21,7 +21,7 @@ INSERT INTO t1 VALUES set session internal_tmp_mem_storage_engine='memory'; set tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. set session debug="d,raise_error"; SELECT MAX(a) FROM t1 GROUP BY a,b; MAX(a) diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index 6180f7ba6e4e..f4d5a253de37 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -1227,7 +1227,7 @@ a 3 b,c 5 SET @@tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT GROUP_CONCAT(DISTINCT a) FROM t1; GROUP_CONCAT(DISTINCT a) a,b,c diff --git a/mysql-test/r/multi_update_innodb.result b/mysql-test/r/multi_update_innodb.result index e0cf82d227ac..7e46e848a006 100644 --- a/mysql-test/r/multi_update_innodb.result +++ b/mysql-test/r/multi_update_innodb.result @@ -146,7 +146,7 @@ INSERT INTO t1 VALUES ('a','j',10); INSERT INTO t1 VALUES ('a','k',11); SET @@SESSION.tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET @@SESSION.internal_tmp_mem_storage_engine=MEMORY; UPDATE t1 a, t1 b SET a.c3=22 WHERE a.c1 = b.c1; SELECT COUNT(*) FROM t1 WHERE c3=22; diff --git a/mysql-test/r/opt_hints_set_var.result b/mysql-test/r/opt_hints_set_var.result index 3c6221409eac..959d325683f1 100644 --- a/mysql-test/r/opt_hints_set_var.result +++ b/mysql-test/r/opt_hints_set_var.result @@ -696,7 +696,7 @@ SELECT /*+ SET_VAR(tmp_table_size=1024) */ COUNT(DISTINCT a) FROM t1; COUNT(DISTINCT a) 128 Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SHOW STATUS LIKE 'Created_tmp_files'; Variable_name Value Created_tmp_files 0 diff --git a/mysql-test/r/query_expression.result b/mysql-test/r/query_expression.result index 2b66e2ec3a3e..cd2fe25800ab 100644 --- a/mysql-test/r/query_expression.result +++ b/mysql-test/r/query_expression.result @@ -5057,7 +5057,7 @@ SET SESSION optimizer_trace="enabled=on"; # a) When we spill SET SESSION tmp_table_size=100000; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT * FROM (SELECT * FROM t INTERSECT SELECT * FROM t) AS derived ORDER BY i LIMIT 20; i d c 0 2022-04-30 abracadabra @@ -5467,7 +5467,7 @@ SET SESSION optimizer_trace="enabled=on"; # a) When we spill SET SESSION tmp_table_size=100000; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT * FROM (SELECT * FROM t INTERSECT SELECT * FROM t) AS derived ORDER BY i LIMIT 20; i d c 0 2022-04-30 abracadabra diff --git a/mysql-test/r/query_expression_debug.result b/mysql-test/r/query_expression_debug.result index d161de3f6ec7..cf5bd74cc35a 100644 --- a/mysql-test/r/query_expression_debug.result +++ b/mysql-test/r/query_expression_debug.result @@ -138,7 +138,7 @@ DROP TABLE no_hashing; SET SESSION optimizer_trace="enabled=on"; SET SESSION tmp_table_size=100000; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. # b) With secondary overflow SET SESSION debug_set_operations_secondary_overflow_at='0 10 20'; SELECT * FROM (SELECT * FROM t INTERSECT SELECT * FROM t) AS derived ORDER BY i LIMIT 20; @@ -429,7 +429,7 @@ DROP TABLE no_hashing; SET SESSION optimizer_trace="enabled=on"; SET SESSION tmp_table_size=100000; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. # b) With secondary overflow SET SESSION debug_set_operations_secondary_overflow_at='0 10 20'; SELECT * FROM (SELECT * FROM t INTERSECT SELECT * FROM t) AS derived ORDER BY i LIMIT 20; diff --git a/mysql-test/r/range_all.result b/mysql-test/r/range_all.result index c602c1826bb2..712fd000512c 100644 --- a/mysql-test/r/range_all.result +++ b/mysql-test/r/range_all.result @@ -3372,7 +3372,7 @@ DROP TABLE t1; SET @old_tmp_table_size=@@tmp_table_size; SET tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1 ( pk INT NOT NULL, col_int_key INT, diff --git a/mysql-test/r/range_icp.result b/mysql-test/r/range_icp.result index 4535036ec935..8c27694318dc 100644 --- a/mysql-test/r/range_icp.result +++ b/mysql-test/r/range_icp.result @@ -3372,7 +3372,7 @@ DROP TABLE t1; SET @old_tmp_table_size=@@tmp_table_size; SET tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1 ( pk INT NOT NULL, col_int_key INT, diff --git a/mysql-test/r/range_icp_mrr.result b/mysql-test/r/range_icp_mrr.result index a63615cdb6d3..f72386f746a4 100644 --- a/mysql-test/r/range_icp_mrr.result +++ b/mysql-test/r/range_icp_mrr.result @@ -3372,7 +3372,7 @@ DROP TABLE t1; SET @old_tmp_table_size=@@tmp_table_size; SET tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1 ( pk INT NOT NULL, col_int_key INT, diff --git a/mysql-test/r/range_mrr.result b/mysql-test/r/range_mrr.result index 7197d4e77274..55d70111b0ea 100644 --- a/mysql-test/r/range_mrr.result +++ b/mysql-test/r/range_mrr.result @@ -3373,7 +3373,7 @@ DROP TABLE t1; SET @old_tmp_table_size=@@tmp_table_size; SET tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1 ( pk INT NOT NULL, col_int_key INT, diff --git a/mysql-test/r/range_mrr_cost.result b/mysql-test/r/range_mrr_cost.result index 623163b24c0c..07c06fdc705d 100644 --- a/mysql-test/r/range_mrr_cost.result +++ b/mysql-test/r/range_mrr_cost.result @@ -3373,7 +3373,7 @@ DROP TABLE t1; SET @old_tmp_table_size=@@tmp_table_size; SET tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1 ( pk INT NOT NULL, col_int_key INT, diff --git a/mysql-test/r/range_none.result b/mysql-test/r/range_none.result index 286ff85f1842..d4d3e020ee9a 100644 --- a/mysql-test/r/range_none.result +++ b/mysql-test/r/range_none.result @@ -3372,7 +3372,7 @@ DROP TABLE t1; SET @old_tmp_table_size=@@tmp_table_size; SET tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1 ( pk INT NOT NULL, col_int_key INT, diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 4cfcc4fb4c86..c2b0f30a708d 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -963,7 +963,7 @@ insert into t1 select * from t2; insert into t2 select * from t1; set local tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. select count(*) from (select * from t1 union all select * from t2 order by 1) b; count(*) 21 diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result index 5086d98c3fc6..1f2bf5fb1107 100644 --- a/mysql-test/r/update.result +++ b/mysql-test/r/update.result @@ -440,7 +440,7 @@ a quux DROP TABLE t1; set tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. create table t1 (id int, a int, key idx(a)); create table t2 (id int unsigned not null auto_increment primary key, a int); insert into t2(a) values(1),(2),(3),(4),(5),(6),(7),(8); diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 9b299bffde4c..c5de1051112c 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -603,7 +603,7 @@ set timestamp=1, timestamp=default; set tmp_table_size=100; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '100' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. set transaction_isolation="READ-COMMITTED"; set wait_timeout=100; set global log_error_verbosity=2; diff --git a/mysql-test/r/window_functions.result b/mysql-test/r/window_functions.result index 04aa148d1d06..f37e476ea639 100644 --- a/mysql-test/r/window_functions.result +++ b/mysql-test/r/window_functions.result @@ -7461,7 +7461,7 @@ Warning 1681 Integer display width is deprecated and will be removed in a future Warning 1287 'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead SET tmp_table_size= 16384; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT DISTINCT MAX( table2.`col_varchar_255_utf8` ) AS max1 , MIN( table1.`col_date` ) AS min1 , AVG( table2.`col_int` ) AS avg1 , @@ -9533,7 +9533,7 @@ INSERT INTO t1 VALUES SET @@session.max_heap_table_size=16*1024; SET @@session.tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET optimizer_switch="derived_condition_pushdown=off"; SET SESSION internal_tmp_mem_storage_engine=MEMORY; SELECT * FROM (SELECT c2, c3, c4, SUM(c1) OVER (PARTITION BY c2) AS wcol FROM t1)o WHERE c2=10; diff --git a/mysql-test/r/window_functions_big.result b/mysql-test/r/window_functions_big.result index 39e82d18f311..103a81ad4040 100644 --- a/mysql-test/r/window_functions_big.result +++ b/mysql-test/r/window_functions_big.result @@ -75,7 +75,7 @@ d summ nth lagg TRUNCATE cpy; set tmp_table_size=16384; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. set max_heap_table_size=16384; Spill frame buffer to INNODB INSERT INTO cpy SELECT d, SUM(d) OVER w summ, NTH_VALUE(d, 3) OVER w nth, LAG(d, 20) OVER w lagg FROM td diff --git a/mysql-test/r/with_recursive_closure.result b/mysql-test/r/with_recursive_closure.result index 9b757bfa9032..99cf9ba8b13e 100644 --- a/mysql-test/r/with_recursive_closure.result +++ b/mysql-test/r/with_recursive_closure.result @@ -38,7 +38,7 @@ Variable_name Value Created_tmp_disk_tables 0 set @@tmp_table_size=1024,@@max_heap_table_size=16384; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. set session internal_tmp_mem_storage_engine='memory'; with recursive closure as (select @start_node as n union select e from edges, closure where s=closure.n) diff --git a/mysql-test/r/with_recursive_innodb_tmp_table.result b/mysql-test/r/with_recursive_innodb_tmp_table.result index 63ea50aaf3bd..cd4b0f54b8a6 100644 --- a/mysql-test/r/with_recursive_innodb_tmp_table.result +++ b/mysql-test/r/with_recursive_innodb_tmp_table.result @@ -138,7 +138,7 @@ set big_tables=0; # limits and queries. set @@tmp_table_size=1024,@@max_heap_table_size=16384; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. set cte_max_recursion_depth=5000; flush status; with recursive q (b) as @@ -212,7 +212,7 @@ Variable_name Value Created_tmp_disk_tables 1 set @@tmp_table_size=30000,@@max_heap_table_size=30000; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. Warning 1292 Truncated incorrect max_heap_table_size value: '30000' set cte_max_recursion_depth=5000; flush status; @@ -287,7 +287,7 @@ Variable_name Value Created_tmp_disk_tables 1 set @@tmp_table_size=60000,@@max_heap_table_size=61000; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. Warning 1292 Truncated incorrect max_heap_table_size value: '61000' set cte_max_recursion_depth=5000; flush status; diff --git a/mysql-test/suite/innodb/r/optimizer_temporary_table.result b/mysql-test/suite/innodb/r/optimizer_temporary_table.result index d9a09a641aa4..bb4acc0b60cc 100644 --- a/mysql-test/suite/innodb/r/optimizer_temporary_table.result +++ b/mysql-test/suite/innodb/r/optimizer_temporary_table.result @@ -4105,7 +4105,7 @@ set @@session.sql_mode = ANSI; set @@session.tmp_table_size = 0; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '0' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. set @@session.big_tables = 1; select @@big_tables; @@big_tables diff --git a/mysql-test/suite/opt_trace/r/temp_table.result b/mysql-test/suite/opt_trace/r/temp_table.result index a2fe08543504..f169794531c8 100644 --- a/mysql-test/suite/opt_trace/r/temp_table.result +++ b/mysql-test/suite/opt_trace/r/temp_table.result @@ -347,7 +347,7 @@ select @@tmp_table_size; SET @old_size= @@tmp_table_size; SET SESSION tmp_table_size= 1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET SESSION internal_tmp_mem_storage_engine='memory'; INSERT INTO t1 SELECT pk+8, col1, col1 FROM tmp; SELECT uniq, col1, col2 FROM t1 GROUP BY uniq; @@ -1344,7 +1344,7 @@ SET SESSION internal_tmp_mem_storage_engine=MEMORY; SET @@session.optimizer_trace='enabled=on'; SET @@session.tmp_table_size = 1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET @@optimizer_switch='semijoin=off'; SELECT name, data FROM t2 WHERE name IN ( SELECT name FROM t1 WHERE type='table'); diff --git a/mysql-test/suite/percona/r/bug_ps8647.result b/mysql-test/suite/percona/r/bug_ps8647.result index ff95f2beaf94..88e5a37b8142 100644 --- a/mysql-test/suite/percona/r/bug_ps8647.result +++ b/mysql-test/suite/percona/r/bug_ps8647.result @@ -1,7 +1,7 @@ call mtr.add_suppression("Tmp_table_size is set below 1MiB."); set session tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. select * from information_schema.APPLICABLE_ROLES; USER HOST GRANTEE GRANTEE_HOST ROLE_NAME ROLE_HOST IS_GRANTABLE IS_DEFAULT IS_MANDATORY select * from information_schema.ADMINISTRABLE_ROLE_AUTHORIZATIONS; diff --git a/mysql-test/suite/percona/r/encrypt_tmp_files.result b/mysql-test/suite/percona/r/encrypt_tmp_files.result index ca6569506b24..7e27c03f1b55 100644 --- a/mysql-test/suite/percona/r/encrypt_tmp_files.result +++ b/mysql-test/suite/percona/r/encrypt_tmp_files.result @@ -68,7 +68,7 @@ DROP TABLE universal_seq; # SET SESSION tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. CREATE TABLE t1(a TEXT,b TEXT); INSERT INTO t1 VALUES(7553,'7553'); INSERT INTO t1 VALUES(662,'aaaaaaaaaaaaaaaaaaaa'); diff --git a/mysql-test/suite/rocksdb/r/instant_add_column_intrinsic_table.result b/mysql-test/suite/rocksdb/r/instant_add_column_intrinsic_table.result index e372bb72e731..d9c5f53a9bf1 100644 --- a/mysql-test/suite/rocksdb/r/instant_add_column_intrinsic_table.result +++ b/mysql-test/suite/rocksdb/r/instant_add_column_intrinsic_table.result @@ -74,7 +74,7 @@ INSERT INTO t1 VALUES SET @@session.max_heap_table_size=16*1024; SET @@session.tmp_table_size=1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET optimizer_switch="derived_condition_pushdown=off"; SET SESSION internal_tmp_mem_storage_engine=MEMORY; SELECT * FROM (SELECT c2, c3, c4, SUM(c1) OVER (PARTITION BY c2) AS wcol FROM t1)o WHERE c2=10; diff --git a/mysql-test/suite/rpl/r/rpl_opt_hints.result b/mysql-test/suite/rpl/r/rpl_opt_hints.result index b3c00333a7de..37a8995244cb 100644 --- a/mysql-test/suite/rpl/r/rpl_opt_hints.result +++ b/mysql-test/suite/rpl/r/rpl_opt_hints.result @@ -7,7 +7,7 @@ CREATE TABLE t1 (f1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f2 INT); INSERT /*+ SET_VAR(auto_increment_increment=10) SET_VAR(tmp_table_size=1024)*/ INTO t1 VALUES (NULL, @@tmp_table_size), (NULL, @@tmp_table_size); Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the replica. include/sync_slave_sql_with_master.inc SELECT * FROM t1; diff --git a/mysql-test/suite/sys_vars/r/innodb_parallel_dblwr_encrypt_basic.result b/mysql-test/suite/sys_vars/r/innodb_parallel_dblwr_encrypt_basic.result deleted file mode 100644 index f6e514373676..000000000000 --- a/mysql-test/suite/sys_vars/r/innodb_parallel_dblwr_encrypt_basic.result +++ /dev/null @@ -1,21 +0,0 @@ -# Basic test for innodb_parallel_dblwr_encrypt -# Default value -SELECT @@GLOBAL.innodb_parallel_dblwr_encrypt; -@@GLOBAL.innodb_parallel_dblwr_encrypt -0 -# restart: --log-error=MYSQLTEST_VARDIR/log/innodb_parallel_dblwr_encrypt.err -# Setting variable to ON should produce a warning -SET @@GLOBAL.innodb_parallel_dblwr_encrypt = ON; -include/assert_grep.inc [There shall be one INNODB_PARALLEL_DBLWR_ENCRYPT warning after setting to ON] -# Setting variable to OFF should produce a warning -SET @@GLOBAL.innodb_parallel_dblwr_encrypt = ON; -include/assert_grep.inc [There shall be two INNODB_PARALLEL_DBLWR_ENCRYPT warnings after setting to OFF] -SET @@SESSION.innodb_parallel_dblwr_encrypt = ON; -ERROR HY000: Variable 'innodb_parallel_dblwr_encrypt' is a GLOBAL variable and should be set with SET GLOBAL -# restart: --innodb-parallel-dblwr-encrypt --log-error=MYSQLTEST_VARDIR/log/innodb_parallel_dblwr_encrypt.err -# The value after restart -SELECT @@GLOBAL.innodb_parallel_dblwr_encrypt; -@@GLOBAL.innodb_parallel_dblwr_encrypt -1 -include/assert_grep.inc [There shall be three INNODB_PARALLEL_DBLWR_ENCRYPT warning in the log file after restart with command-line option] -# restart diff --git a/mysql-test/suite/sys_vars/r/innodb_parallel_doublewrite_path_basic.result b/mysql-test/suite/sys_vars/r/innodb_parallel_doublewrite_path_basic.result deleted file mode 100644 index a725e35196b9..000000000000 --- a/mysql-test/suite/sys_vars/r/innodb_parallel_doublewrite_path_basic.result +++ /dev/null @@ -1,17 +0,0 @@ -# Basic test for innodb_parallel_doublewrite_path -# Default value -SELECT @@GLOBAL.innodb_parallel_doublewrite_path; -@@GLOBAL.innodb_parallel_doublewrite_path -xb_doublewrite -# restart: --innodb-parallel-doublewrite-path=custom --log-error=MYSQLTEST_VARDIR/log/innodb_parallel_doublewrite_path.err -# The value after restart -SELECT @@GLOBAL.innodb_parallel_doublewrite_path; -@@GLOBAL.innodb_parallel_doublewrite_path -custom -# Setting variable should fail -SET @@GLOBAL.innodb_parallel_doublewrite_path="foo"; -ERROR HY000: Variable 'innodb_parallel_doublewrite_path' is a read only variable -SET @@SESSION.innodb_parallel_doublewrite_path="foo"; -ERROR HY000: Variable 'innodb_parallel_doublewrite_path' is a read only variable -include/assert_grep.inc [There shall be a warning when INNODB_PARALLEL_DOUBLEWRITE_PATH is explicitly specified] -# restart diff --git a/mysql-test/suite/sys_vars/r/maximum_basic.result b/mysql-test/suite/sys_vars/r/maximum_basic.result index 4a5076de13ed..1248f92546ed 100644 --- a/mysql-test/suite/sys_vars/r/maximum_basic.result +++ b/mysql-test/suite/sys_vars/r/maximum_basic.result @@ -7,7 +7,7 @@ SELECT @@session.auto_increment_increment; SET @@session.tmp_table_size=40960; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '40960' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@session.tmp_table_size; @@session.tmp_table_size 1048576 diff --git a/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result b/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result index 6d1b6c3a5b32..6a5eaa529bb1 100644 --- a/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result +++ b/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result @@ -4,12 +4,12 @@ SET @start_session_value = @@session.tmp_table_size; SET @@global.tmp_table_size = 100; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '100' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET @@global.tmp_table_size = DEFAULT; SET @@session.tmp_table_size = 200; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '200' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET @@session.tmp_table_size = DEFAULT; '#--------------------FN_DYNVARS_005_02-------------------------#' SELECT @@global.tmp_table_size >= 16777216; @@ -21,13 +21,13 @@ SELECT @@session.tmp_table_size >= 16777216; '#--------------------FN_DYNVARS_005_03-------------------------#' SET @@global.tmp_table_size = 1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@global.tmp_table_size; @@global.tmp_table_size 1048576 SET @@global.tmp_table_size = 60020; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@global.tmp_table_size; @@global.tmp_table_size 1048576 @@ -38,7 +38,7 @@ SELECT @@global.tmp_table_size; '#--------------------FN_DYNVARS_005_04-------------------------#' SET @@session.tmp_table_size = 1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@session.tmp_table_size; @@session.tmp_table_size 1048576 @@ -48,7 +48,7 @@ SELECT @@session.tmp_table_size; 4294967295 SET @@session.tmp_table_size = 65535; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@session.tmp_table_size; @@session.tmp_table_size 1048576 @@ -56,21 +56,21 @@ SELECT @@session.tmp_table_size; SET @@global.tmp_table_size = 0; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '0' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@global.tmp_table_size; @@global.tmp_table_size 1048576 SET @@global.tmp_table_size = -1024; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '-1024' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@global.tmp_table_size; @@global.tmp_table_size 1048576 SET @@global.tmp_table_size = 1000; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '1000' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@global.tmp_table_size; @@global.tmp_table_size 1048576 @@ -90,14 +90,14 @@ ERROR 42000: Incorrect argument type to variable 'tmp_table_size' SET @@global.tmp_table_size = True; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '1' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@global.tmp_table_size; @@global.tmp_table_size 1048576 SET @@global.tmp_table_size = False; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '0' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@global.tmp_table_size; @@global.tmp_table_size 1048576 @@ -112,7 +112,7 @@ ERROR 42000: Incorrect argument type to variable 'tmp_table_size' SET @@session.tmp_table_size = True; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '1' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@session.tmp_table_size; @@session.tmp_table_size 1048576 @@ -121,7 +121,7 @@ ERROR 42000: Incorrect argument type to variable 'tmp_table_size' SET @@session.tmp_table_size = False; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '0' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@session.tmp_table_size; @@session.tmp_table_size 1048576 @@ -135,7 +135,7 @@ SELECT @@session.tmp_table_size; SET @@session.tmp_table_size = 1000; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '1000' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@session.tmp_table_size; @@session.tmp_table_size 1048576 @@ -158,7 +158,7 @@ WHERE VARIABLE_NAME='tmp_table_size'; '#---------------------FN_DYNVARS_001_09----------------------#' SET @@global.tmp_table_size = 1024; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SET @@tmp_table_size = 4294967295; SELECT @@tmp_table_size = @@global.tmp_table_size; @@tmp_table_size = @@global.tmp_table_size @@ -167,7 +167,7 @@ SELECT @@tmp_table_size = @@global.tmp_table_size; SET @@tmp_table_size = 100; Warnings: Warning 1292 Truncated incorrect tmp_table_size value: '100' -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@tmp_table_size = @@local.tmp_table_size; @@tmp_table_size = @@local.tmp_table_size 1 @@ -177,7 +177,7 @@ SELECT @@local.tmp_table_size = @@session.tmp_table_size; '#---------------------FN_DYNVARS_001_11----------------------#' SET tmp_table_size = 1027; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@tmp_table_size; @@tmp_table_size 1048576 diff --git a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result index 7bd651cc3e0e..766974fcc480 100644 --- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result +++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result @@ -172,7 +172,7 @@ SELECT @@global.transaction_alloc_block_size; 8192 SET @@session.tmp_table_size = @start_session_value; Warnings: -Warning 48040 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. +Warning 48038 Tmp_table_size is set below 1MiB. The TEMPTABLE engine requires at least 1MiB table size, and will use that value instead. Please increase the limit to silence this warning. SELECT @@session.transaction_alloc_block_size; @@session.transaction_alloc_block_size 1024 diff --git a/mysql-test/suite/sys_vars/t/innodb_parallel_dblwr_encrypt_basic.test b/mysql-test/suite/sys_vars/t/innodb_parallel_dblwr_encrypt_basic.test deleted file mode 100644 index 6e4cf651e02c..000000000000 --- a/mysql-test/suite/sys_vars/t/innodb_parallel_dblwr_encrypt_basic.test +++ /dev/null @@ -1,46 +0,0 @@ ---echo # Basic test for innodb_parallel_dblwr_encrypt - ---echo # Default value -SELECT @@GLOBAL.innodb_parallel_dblwr_encrypt; - ---let $custom_log_file = $MYSQLTEST_VARDIR/log/innodb_parallel_dblwr_encrypt.err ---let $restart_parameters = restart: --log-error=$custom_log_file - ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---source include/restart_mysqld.inc - ---echo # Setting variable to ON should produce a warning -SET @@GLOBAL.innodb_parallel_dblwr_encrypt = ON; - ---let $assert_select = \\[InnoDB\\] Setting Percona-specific INNODB_PARALLEL_DBLWR_ENCRYPT is deprecated and has no effect\\. ---let $assert_file = $custom_log_file ---let $assert_count = 1 ---let $assert_text = There shall be one INNODB_PARALLEL_DBLWR_ENCRYPT warning after setting to ON ---source include/assert_grep.inc - ---echo # Setting variable to OFF should produce a warning -SET @@GLOBAL.innodb_parallel_dblwr_encrypt = ON; - ---let $assert_count = 2 ---let $assert_text = There shall be two INNODB_PARALLEL_DBLWR_ENCRYPT warnings after setting to OFF ---source include/assert_grep.inc - ---error ER_GLOBAL_VARIABLE -SET @@SESSION.innodb_parallel_dblwr_encrypt = ON; - ---let $restart_parameters = restart: --innodb-parallel-dblwr-encrypt --log-error=$custom_log_file - ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---source include/restart_mysqld.inc - ---echo # The value after restart -SELECT @@GLOBAL.innodb_parallel_dblwr_encrypt; - ---let $assert_count = 3 ---let $assert_text = There shall be three INNODB_PARALLEL_DBLWR_ENCRYPT warning in the log file after restart with command-line option ---source include/assert_grep.inc - ---let $restart_parameters = ---source include/restart_mysqld.inc - ---remove_file $custom_log_file diff --git a/mysql-test/suite/sys_vars/t/innodb_parallel_doublewrite_path_basic.test b/mysql-test/suite/sys_vars/t/innodb_parallel_doublewrite_path_basic.test deleted file mode 100644 index a6c93a783aa8..000000000000 --- a/mysql-test/suite/sys_vars/t/innodb_parallel_doublewrite_path_basic.test +++ /dev/null @@ -1,32 +0,0 @@ ---echo # Basic test for innodb_parallel_doublewrite_path - ---echo # Default value -SELECT @@GLOBAL.innodb_parallel_doublewrite_path; - ---let $custom_log_file = $MYSQLTEST_VARDIR/log/innodb_parallel_doublewrite_path.err ---let $restart_parameters = restart: --innodb-parallel-doublewrite-path=custom --log-error=$custom_log_file - ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---source include/restart_mysqld.inc - ---echo # The value after restart -SELECT @@GLOBAL.innodb_parallel_doublewrite_path; - ---echo # Setting variable should fail ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_parallel_doublewrite_path="foo"; - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@SESSION.innodb_parallel_doublewrite_path="foo"; - - ---let $assert_file = $custom_log_file ---let $assert_select = \\[InnoDB\\] Setting Percona-specific INNODB_PARALLEL_DOUBLEWRITE_PATH is deprecated and has no effect\\. Use INNODB_DOUBLEWRITE_DIR instead\\. ---let $assert_count = 1 ---let $assert_text = There shall be a warning when INNODB_PARALLEL_DOUBLEWRITE_PATH is explicitly specified ---source include/assert_grep.inc - ---let $restart_parameters = ---source include/restart_mysqld.inc - ---remove_file $custom_log_file diff --git a/share/messages_to_error_log.txt b/share/messages_to_error_log.txt index 3054469e80f6..1ec115b47d97 100644 --- a/share/messages_to_error_log.txt +++ b/share/messages_to_error_log.txt @@ -12702,12 +12702,6 @@ ER_IB_MSG_UNDO_TRUNCATE_DELAY_BY_LTFB ER_XPLUGIN_SSL_RELOAD_REGISTER_FAILED eng "X plugin failed to register SSL reload callback. ALTER INSTANCE RELOAD TLS will have no effect on the plugin." -ER_IB_MSG_DEPRECATED_INNODB_PARALLEL_DOUBLEWRITE_PATH - eng "Setting Percona-specific INNODB_PARALLEL_DOUBLEWRITE_PATH is deprecated and has no effect. Use INNODB_DOUBLEWRITE_DIR instead." - -ER_IB_MSG_DEPRECATED_INNODB_PARALLEL_DBLWR_ENCRYPT - eng "Setting Percona-specific INNODB_PARALLEL_DBLWR_ENCRYPT is deprecated and has no effect." - ER_KEYRING_COMPONENT_NO_CONFIG eng "Keyring configuration doesn't exists: %s" diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 37e3d2a4174e..e0752da6325a 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -351,13 +351,6 @@ static char *innodb_version_str = (char *)INNODB_VERSION_STR; static Innodb_data_lock_inspector innodb_data_lock_inspector; -/** Path to the Percona-specific parallel doublewrite buffer (Deprecated) */ -static char *srv_parallel_doublewrite_path_deprecated = nullptr; - -/** Enable or disable encryption of pages in parallel doublewrite buffer -file (Deprecated) */ -static bool srv_parallel_dblwr_encrypt_deprecated = false; - /** Note we cannot use rec_format_enum because we do not allow COMPRESSED row format for innodb_default_row_format option. */ enum default_row_format_enum { @@ -4866,38 +4859,6 @@ static void innodb_undo_tablespaces_deprecate() { } } -/** Validate innodb_parallel_doublewrite_path. Log a warning if it was set -explicitly. */ -static void innodb_parallel_doublewrite_path_deprecate() { - if (sysvar_source_svc != nullptr) { - static const char *variable_name = "innodb_parallel_doublewrite_path"; - enum enum_variable_source source; - if (!sysvar_source_svc->get( - variable_name, static_cast(strlen(variable_name)), - &source)) { - if (source != COMPILED) { - ib::warn(ER_IB_MSG_DEPRECATED_INNODB_PARALLEL_DOUBLEWRITE_PATH); - } - } - } -} - -/** Validate innodb_parallel_dblwr_encrypt. Log a warning if it was set -explicitly. */ -static void innodb_parallel_dblwr_encrypt_deprecate() { - if (sysvar_source_svc != nullptr) { - static const char *variable_name = "innodb_parallel_dblwr_encrypt"; - enum enum_variable_source source; - if (!sysvar_source_svc->get( - variable_name, static_cast(strlen(variable_name)), - &source)) { - if (source != COMPILED) { - ib::warn(ER_IB_MSG_DEPRECATED_INNODB_PARALLEL_DBLWR_ENCRYPT); - } - } - } -} - /** Initialize and normalize innodb_buffer_pool_size. */ static void innodb_buffer_pool_size_init() { #ifdef UNIV_DEBUG @@ -5449,8 +5410,6 @@ static int innodb_init_params() { innodb_buffer_pool_size_init(); innodb_undo_tablespaces_deprecate(); - innodb_parallel_doublewrite_path_deprecate(); - innodb_parallel_dblwr_encrypt_deprecate(); innodb_redo_log_capacity_init(); @@ -22457,32 +22416,6 @@ static void innodb_undo_tablespaces_update(THD *thd [[maybe_unused]], innodb_undo_tablespaces_deprecate(); } -/** Validate the value of innodb_parallel_doublewrite_path global variable. -This function is registered as a callback with MySQL. -@param[in] thd thread handle -@param[in] var pointer to system variable -@param[in] var_ptr where the formal string goes -@param[in] save immediate result from check function */ -static void innodb_parallel_doublewrite_path_update( - THD *thd [[maybe_unused]], SYS_VAR *var [[maybe_unused]], - void *var_ptr [[maybe_unused]], const void *save [[maybe_unused]]) { - innodb_parallel_doublewrite_path_deprecate(); -} - -/** Validate the value of innodb_parallel_dblwr_encrypt global variable. -This function is registered as a callback with MySQL. -@param[in] thd thread handle -@param[in] var pointer to system variable -@param[in] var_ptr where the formal string goes -@param[in] save immediate result from check function */ -static void innodb_parallel_dblwr_encrypt_update(THD *thd [[maybe_unused]], - SYS_VAR *var [[maybe_unused]], - void *var_ptr [[maybe_unused]], - const void *save - [[maybe_unused]]) { - innodb_parallel_dblwr_encrypt_deprecate(); -} - /* Declare default check function for boolean system variable. Cannot include sql_plugin_var.h header in this file due to conflicting macro definitions. */ int check_func_bool(THD *, SYS_VAR *, void *save, st_mysql_value *value); @@ -24595,22 +24528,6 @@ static MYSQL_SYSVAR_ENUM( "except for the deletion.", nullptr, nullptr, 0, &corrupt_table_action_typelib); -static MYSQL_SYSVAR_STR( - parallel_doublewrite_path, srv_parallel_doublewrite_path_deprecated, - PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOPERSIST, - "Deprecated Percona-specific variable that was used to set path to the " - "parallel doublewrite file and has no effect now. " - "Use --innodb-doublewrite-dir instead.", - nullptr, innodb_parallel_doublewrite_path_update, "xb_doublewrite"); - -static MYSQL_SYSVAR_BOOL( - parallel_dblwr_encrypt, srv_parallel_dblwr_encrypt_deprecated, - PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_NOPERSIST, - "Deprecated Percona-specific variable that was used to enable or " - "disable encryption of parallel doublewrite buffer file and has no " - "effect now.", - nullptr, innodb_parallel_dblwr_encrypt_update, false); - static MYSQL_SYSVAR_UINT( compressed_columns_zip_level, srv_compressed_columns_zip_level, PLUGIN_VAR_RQCMDARG, @@ -24865,8 +24782,6 @@ static SYS_VAR *innobase_system_variables[] = { MYSQL_SYSVAR(parallel_read_threads), MYSQL_SYSVAR(segment_reserve_factor), MYSQL_SYSVAR(corrupt_table_action), - MYSQL_SYSVAR(parallel_doublewrite_path), - MYSQL_SYSVAR(parallel_dblwr_encrypt), MYSQL_SYSVAR(compressed_columns_zip_level), MYSQL_SYSVAR(compressed_columns_threshold), MYSQL_SYSVAR(ft_ignore_stopwords),