diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-18 14:17:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-28 19:21:14 +0200 |
| commit | cd41ffe1f1e86891b12878af0d9efcc6f7320f59 (patch) | |
| tree | 4ae44beaed8ca9eeaa5745c13c03bfd3d63533b8 | |
| parent | de9ef03ae6a6cf573062c89d22ca446154f435f5 (diff) | |
| download | mariadb-git-cd41ffe1f1e86891b12878af0d9efcc6f7320f59.tar.gz | |
MDEV-19713 Remove big_tables system variable
mark big_tables deprecated, the server can put temp tables on disk
as needed avoiding "table full" errors.
in case someone would really need to force a tmp table to be created
on disk from the start and for testing allow tmp_memory_table_size
to be set to 0.
fix tests to use that instead (and add a test that it actually
works).
make sure in-memory TREE size limit is never 0 (it's [ab]using
tmp_memory_table_size at the moment)
remove few sys_vars.*_basic tests
47 files changed, 453 insertions, 1155 deletions
diff --git a/mysql-test/include/common-tests.inc b/mysql-test/include/common-tests.inc index 347760bf3c0..9c6b29858c8 100644 --- a/mysql-test/include/common-tests.inc +++ b/mysql-test/include/common-tests.inc @@ -1412,9 +1412,9 @@ drop table tmp; # big table done -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; select distinct fld5 from t2 limit 10; @@ -1423,9 +1423,9 @@ select distinct fld5 from t2 limit 10; # select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET BIG_TABLES=1; # Force use of MyISAM +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; # diff --git a/mysql-test/main/compress.result b/mysql-test/main/compress.result index 8fbbb324b16..788eb7ab13b 100644 --- a/mysql-test/main/compress.result +++ b/mysql-test/main/compress.result @@ -515,7 +515,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -528,7 +528,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -565,7 +565,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -578,7 +578,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/cte_recursive.result b/mysql-test/main/cte_recursive.result index b88f0ff6255..de0f515d0ad 100644 --- a/mysql-test/main/cte_recursive.result +++ b/mysql-test/main/cte_recursive.result @@ -3110,7 +3110,7 @@ SELECT * FROM cte; # # MDEV-15575: using recursive cte with big_tables enabled # -set big_tables=1; +set tmp_memory_table_size=0; with recursive qn as (select 123 as a union all select 1+a from qn where a<130) select * from qn; @@ -3123,13 +3123,13 @@ a 128 129 130 -set big_tables=default; +set tmp_memory_table_size=default; # # MDEV-15571: using recursive cte with big_tables enabled # create table t1 (a bigint); insert into t1 values(1); -set big_tables=1; +set tmp_memory_table_size=0; with recursive qn as ( select a from t1 @@ -3138,13 +3138,13 @@ select a*2000 from qn where a<10000000000000000000 ) select * from qn; ERROR 22003: BIGINT value is out of range in '`qn`.`a` * 2000' -set big_tables=default; +set tmp_memory_table_size=default; drop table t1; # # MDEV-15556: using recursive cte with big_tables enabled # when recursive tables are accessed by key # -SET big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1 (id int, name char(10), leftpar int, rightpar int); INSERT INTO t1 VALUES (1, "A", 2, 3), (2, "LA", 4, 5), (4, "LLA", 6, 7), @@ -3195,7 +3195,7 @@ id select_type table type possible_keys key key_len ref rows Extra 4 RECURSIVE UNION <derived2> ref key0 key0 5 test.t2.id 2 NULL UNION RESULT <union2,3,4> ALL NULL NULL NULL NULL NULL DROP TABLE t1,t2; -SET big_tables=0; +set tmp_memory_table_size=default; # # MDEV-15840: recursive tables are accessed by key # (the same problem as for MDEV-15556) diff --git a/mysql-test/main/cte_recursive.test b/mysql-test/main/cte_recursive.test index 6a4f55cd408..ce3b817a937 100644 --- a/mysql-test/main/cte_recursive.test +++ b/mysql-test/main/cte_recursive.test @@ -2138,13 +2138,13 @@ SELECT * FROM cte; --echo # MDEV-15575: using recursive cte with big_tables enabled --echo # -set big_tables=1; +set tmp_memory_table_size=0; # force on-disk tmp table with recursive qn as (select 123 as a union all select 1+a from qn where a<130) select * from qn; -set big_tables=default; +set tmp_memory_table_size=default; --echo # --echo # MDEV-15571: using recursive cte with big_tables enabled @@ -2153,7 +2153,7 @@ set big_tables=default; create table t1 (a bigint); insert into t1 values(1); -set big_tables=1; +set tmp_memory_table_size=0; # force on-disk tmp table --error ER_DATA_OUT_OF_RANGE with recursive qn as @@ -2164,7 +2164,7 @@ with recursive qn as ) select * from qn; -set big_tables=default; +set tmp_memory_table_size=default; drop table t1; @@ -2173,7 +2173,7 @@ drop table t1; --echo # when recursive tables are accessed by key --echo # -SET big_tables=1; +set tmp_memory_table_size=0; # force on-disk tmp table CREATE TABLE t1 (id int, name char(10), leftpar int, rightpar int); INSERT INTO t1 VALUES @@ -2202,7 +2202,7 @@ eval EXPLAIN $q; DROP TABLE t1,t2; -SET big_tables=0; +set tmp_memory_table_size=default; --echo # --echo # MDEV-15840: recursive tables are accessed by key diff --git a/mysql-test/main/group_by.result b/mysql-test/main/group_by.result index d1b0898e6b2..3108f2f4e65 100644 --- a/mysql-test/main/group_by.result +++ b/mysql-test/main/group_by.result @@ -321,6 +321,7 @@ a c count(distinct rand()) drop table t1; CREATE TABLE t1 (a char(1)); INSERT INTO t1 VALUES ('A'),('B'),('A'),('B'),('A'),('B'),(NULL),('a'),('b'),(NULL),('A'),('B'),(NULL); +flush status; SELECT a FROM t1 GROUP BY a; a NULL @@ -359,7 +360,11 @@ A 4 B 4 a 1 b 1 -SET BIG_TABLES=1; +show status like 'Created%tables'; +Variable_name Value +Created_tmp_disk_tables 0 +Created_tmp_tables 6 +set tmp_memory_table_size=0; SELECT a FROM t1 GROUP BY a; a NULL @@ -398,7 +403,11 @@ A 4 B 4 a 1 b 1 -SET BIG_TABLES=0; +show status like 'Created%tables'; +Variable_name Value +Created_tmp_disk_tables 6 +Created_tmp_tables 12 +set tmp_memory_table_size=default; drop table t1; CREATE TABLE t1 ( `a` char(193) default NULL, @@ -515,14 +524,14 @@ a count(*) NULL 9 3 b 1 -set big_tables=1; +set tmp_memory_table_size=0; select a,count(*) from t1 group by a; a count(*) NULL 9 3 b 1 drop table t1; -set big_tables=0; +set tmp_memory_table_size=default; SET @save_optimizer_use_condition_selectivity=@@optimizer_use_condition_selectivity,@save_optimizer_switch=@@optimizer_switch; SET optimizer_switch='outer_join_with_cache=off',@@optimizer_use_condition_selectivity=4; create table t1 (a int not null, b int not null); @@ -1964,7 +1973,7 @@ DROP TABLE t1; # Bug#11765254 (58200): Assertion failed: param.sort_length when grouping # by functions # -SET BIG_TABLES=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (0),(0); SELECT 1 FROM t1 GROUP BY IF(`a`,'',''); @@ -1991,7 +2000,7 @@ Warning 1292 Truncated incorrect INTEGER value: 'jxW<' Warning 1292 Truncated incorrect INTEGER value: 'K' Warning 1292 Truncated incorrect INTEGER value: 'jxW<' DROP TABLE t1; -SET BIG_TABLES=0; +set tmp_memory_table_size=default; # # MDEV-641 LP:1002108 - Wrong result (or crash) from a query with duplicated field in the group list and a limit clause # Bug#11761078: 53534: INCORRECT 'SELECT SQL_BIG_RESULT...' diff --git a/mysql-test/main/group_by.test b/mysql-test/main/group_by.test index f9242b5b4ff..7ba0945cc72 100644 --- a/mysql-test/main/group_by.test +++ b/mysql-test/main/group_by.test @@ -280,21 +280,28 @@ drop table t1; CREATE TABLE t1 (a char(1)); INSERT INTO t1 VALUES ('A'),('B'),('A'),('B'),('A'),('B'),(NULL),('a'),('b'),(NULL),('A'),('B'),(NULL); +flush status; SELECT a FROM t1 GROUP BY a; SELECT a,count(*) FROM t1 GROUP BY a; SELECT a FROM t1 GROUP BY binary a; SELECT a,count(*) FROM t1 GROUP BY binary a; SELECT binary a FROM t1 GROUP BY 1; SELECT binary a,count(*) FROM t1 GROUP BY 1; -# Do the same tests with MyISAM temporary tables -SET BIG_TABLES=1; +--disable_ps_protocol +show status like 'Created%tables'; +--enable_ps_protocol +# Do the same tests with on-disk temporary tables +set tmp_memory_table_size=0; SELECT a FROM t1 GROUP BY a; SELECT a,count(*) FROM t1 GROUP BY a; SELECT a FROM t1 GROUP BY binary a; SELECT a,count(*) FROM t1 GROUP BY binary a; SELECT binary a FROM t1 GROUP BY 1; SELECT binary a,count(*) FROM t1 GROUP BY 1; -SET BIG_TABLES=0; +--disable_ps_protocol +show status like 'Created%tables'; +--enable_ps_protocol +set tmp_memory_table_size=default; drop table t1; # @@ -391,10 +398,10 @@ drop table t1,t2,t3; create table t1 (a blob null); insert into t1 values (NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(""),(""),(""),("b"); select a,count(*) from t1 group by a; -set big_tables=1; +set tmp_memory_table_size=0; select a,count(*) from t1 group by a; drop table t1; -set big_tables=0; +set tmp_memory_table_size=default; # # Test of GROUP BY ... ORDER BY NULL optimization @@ -1344,7 +1351,7 @@ DROP TABLE t1; --echo # by functions --echo # -SET BIG_TABLES=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (0),(0); SELECT 1 FROM t1 GROUP BY IF(`a`,'',''); @@ -1352,7 +1359,7 @@ SELECT 1 FROM t1 GROUP BY TRIM(LEADING RAND() FROM ''); SELECT 1 FROM t1 GROUP BY SUBSTRING('',SLEEP(0),''); SELECT 1 FROM t1 GROUP BY SUBSTRING(SYSDATE() FROM 'K' FOR 'jxW<'); DROP TABLE t1; -SET BIG_TABLES=0; +set tmp_memory_table_size=default; --echo # --echo # MDEV-641 LP:1002108 - Wrong result (or crash) from a query with duplicated field in the group list and a limit clause diff --git a/mysql-test/main/named_pipe.result b/mysql-test/main/named_pipe.result index f8c2acf98a0..9fc7abd79f5 100644 --- a/mysql-test/main/named_pipe.result +++ b/mysql-test/main/named_pipe.result @@ -509,7 +509,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -522,7 +522,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -559,7 +559,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -572,7 +572,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/pool_of_threads.result b/mysql-test/main/pool_of_threads.result index 9c02dfac9cd..fd3c848117c 100644 --- a/mysql-test/main/pool_of_threads.result +++ b/mysql-test/main/pool_of_threads.result @@ -509,7 +509,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -522,7 +522,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -559,7 +559,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -572,7 +572,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/select.result b/mysql-test/main/select.result index 0f84ed684da..ba5ec36430e 100644 --- a/mysql-test/main/select.result +++ b/mysql-test/main/select.result @@ -512,7 +512,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -525,7 +525,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -562,7 +562,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -575,7 +575,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/select.test b/mysql-test/main/select.test index 43984810c66..22baccc625c 100644 --- a/mysql-test/main/select.test +++ b/mysql-test/main/select.test @@ -1425,9 +1425,9 @@ drop table tmp; # big table done -SET BIG_TABLES=1; +set tmp_memory_table_size=0; # force on-disk tmp table select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; select distinct fld5 from t2 limit 10; @@ -1436,9 +1436,9 @@ select distinct fld5 from t2 limit 10; # select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET BIG_TABLES=1; # Force use of MyISAM +set tmp_memory_table_size=0; # force on-disk tmp table select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; # diff --git a/mysql-test/main/select_jcl6.result b/mysql-test/main/select_jcl6.result index 7276814114f..2de5df60901 100644 --- a/mysql-test/main/select_jcl6.result +++ b/mysql-test/main/select_jcl6.result @@ -523,7 +523,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -536,7 +536,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -573,7 +573,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -586,7 +586,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/select_pkeycache.result b/mysql-test/main/select_pkeycache.result index 0f84ed684da..ba5ec36430e 100644 --- a/mysql-test/main/select_pkeycache.result +++ b/mysql-test/main/select_pkeycache.result @@ -512,7 +512,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -525,7 +525,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -562,7 +562,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -575,7 +575,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/ssl.result b/mysql-test/main/ssl.result index 00faea58fd2..40a32fdd1dd 100644 --- a/mysql-test/main/ssl.result +++ b/mysql-test/main/ssl.result @@ -518,7 +518,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -531,7 +531,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -568,7 +568,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -581,7 +581,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/ssl_compress.result b/mysql-test/main/ssl_compress.result index d298f8ec6e4..8c63c798afa 100644 --- a/mysql-test/main/ssl_compress.result +++ b/mysql-test/main/ssl_compress.result @@ -515,7 +515,7 @@ insert into tmp select * from t3; insert into t3 select * from tmp; alter table t3 add t2nr int not null auto_increment primary key first; drop table tmp; -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham @@ -528,7 +528,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham @@ -565,7 +565,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=1; +set tmp_memory_table_size=0; select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 @@ -578,7 +578,7 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 -SET BIG_TABLES=0; +set tmp_memory_table_size=default; select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 diff --git a/mysql-test/main/subselect.result b/mysql-test/main/subselect.result index 349e7dca129..2f78a77b10f 100644 --- a/mysql-test/main/subselect.result +++ b/mysql-test/main/subselect.result @@ -7134,7 +7134,7 @@ drop table t1,t2,t3,t4; # MDEV-7122 # Assertion `0' failed in subselect_hash_sj_engine::init # -SET SESSION big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a char(255) DEFAULT '', KEY(a(10))) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; INSERT INTO t1 VALUES(0),(0),(0); SELECT * FROM t1 WHERE a IN(SELECT MIN(a) FROM t1); @@ -7143,7 +7143,7 @@ a 0 0 DROP TABLE t1; -SET SESSION big_tables=0; +set tmp_memory_table_size=default; # # MDEV-10776: Server crash on query # diff --git a/mysql-test/main/subselect.test b/mysql-test/main/subselect.test index be17254202e..8b34e32740b 100644 --- a/mysql-test/main/subselect.test +++ b/mysql-test/main/subselect.test @@ -5959,12 +5959,12 @@ drop table t1,t2,t3,t4; --echo # MDEV-7122 --echo # Assertion `0' failed in subselect_hash_sj_engine::init --echo # -SET SESSION big_tables=1; +set tmp_memory_table_size=0; # force on-disk tmp table CREATE TABLE t1(a char(255) DEFAULT '', KEY(a(10))) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; INSERT INTO t1 VALUES(0),(0),(0); SELECT * FROM t1 WHERE a IN(SELECT MIN(a) FROM t1); DROP TABLE t1; -SET SESSION big_tables=0; +set tmp_memory_table_size=default; --echo # --echo # MDEV-10776: Server crash on query diff --git a/mysql-test/main/subselect_cache.result b/mysql-test/main/subselect_cache.result index d6bd8970750..0d6f459ce88 100644 --- a/mysql-test/main/subselect_cache.result +++ b/mysql-test/main/subselect_cache.result @@ -1861,7 +1861,7 @@ Subquery_cache_hit 0 Subquery_cache_miss 4 drop table t1; #test of big_tables switch and outer table reference in subquery with grouping -set big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1 (a INT PRIMARY KEY, b INT); INSERT INTO t1 VALUES (1,1),(2,1),(3,2),(4,2),(5,3),(6,3); SELECT (SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1) FROM t1 AS t1_outer; @@ -1873,7 +1873,7 @@ SELECT (SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1) FROM t1 AS t1_ 5 6 drop table t1; -set big_tables=0; +set tmp_memory_table_size=default; #test of function reference to outer query set local group_concat_max_len=400; create table t2 (a int, b int); diff --git a/mysql-test/main/subselect_cache.test b/mysql-test/main/subselect_cache.test index fa806ecdc9f..8fcecf1281b 100644 --- a/mysql-test/main/subselect_cache.test +++ b/mysql-test/main/subselect_cache.test @@ -429,12 +429,12 @@ show status like "subquery_cache%"; drop table t1; --echo #test of big_tables switch and outer table reference in subquery with grouping -set big_tables=1; +set tmp_memory_table_size=0; # force on-disk tmp table CREATE TABLE t1 (a INT PRIMARY KEY, b INT); INSERT INTO t1 VALUES (1,1),(2,1),(3,2),(4,2),(5,3),(6,3); SELECT (SELECT t1_outer.a FROM t1 AS t1_inner GROUP BY b LIMIT 1) FROM t1 AS t1_outer; drop table t1; -set big_tables=0; +set tmp_memory_table_size=default; --echo #test of function reference to outer query set local group_concat_max_len=400; diff --git a/mysql-test/main/subselect_mat.result b/mysql-test/main/subselect_mat.result index 34b58daa50e..c5fa7ddc92c 100644 --- a/mysql-test/main/subselect_mat.result +++ b/mysql-test/main/subselect_mat.result @@ -2118,8 +2118,7 @@ DROP VIEW v2; # # MDEV-5811: Server crashes in best_access_path with materialization+semijoin and big_tables=ON # -SET @tmp_mdev5811= @@big_tables; -SET big_tables = ON; +set tmp_memory_table_size=0; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (b INT); @@ -2128,7 +2127,7 @@ SELECT * FROM t1 AS t1_1, t1 AS t1_2 WHERE ( t1_1.a, t1_2.a ) IN ( SELECT MAX(b), MIN(b) FROM t2 ); a a DROP TABLE t1,t2; -SET big_tables=@tmp_mdev5811; +set tmp_memory_table_size=default; # End of 5.3 tests # # MDEV-5056: Wrong result (extra rows) with materialization+semijoin, IN subqueries diff --git a/mysql-test/main/subselect_no_exists_to_in.result b/mysql-test/main/subselect_no_exists_to_in.result index 84c415d1ce1..e830c8bdc91 100644 --- a/mysql-test/main/subselect_no_exists_to_in.result +++ b/mysql-test/main/subselect_no_exists_to_in.result @@ -7134,7 +7134,7 @@ drop table t1,t2,t3,t4; # MDEV-7122 # Assertion `0' failed in subselect_hash_sj_engine::init # -SET SESSION big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a char(255) DEFAULT '', KEY(a(10))) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; INSERT INTO t1 VALUES(0),(0),(0); SELECT * FROM t1 WHERE a IN(SELECT MIN(a) FROM t1); @@ -7143,7 +7143,7 @@ a 0 0 DROP TABLE t1; -SET SESSION big_tables=0; +set tmp_memory_table_size=default; # # MDEV-10776: Server crash on query # diff --git a/mysql-test/main/subselect_no_mat.result b/mysql-test/main/subselect_no_mat.result index 93035e235f7..8203f59f92b 100644 --- a/mysql-test/main/subselect_no_mat.result +++ b/mysql-test/main/subselect_no_mat.result @@ -7127,7 +7127,7 @@ drop table t1,t2,t3,t4; # MDEV-7122 # Assertion `0' failed in subselect_hash_sj_engine::init # -SET SESSION big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a char(255) DEFAULT '', KEY(a(10))) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; INSERT INTO t1 VALUES(0),(0),(0); SELECT * FROM t1 WHERE a IN(SELECT MIN(a) FROM t1); @@ -7136,7 +7136,7 @@ a 0 0 DROP TABLE t1; -SET SESSION big_tables=0; +set tmp_memory_table_size=default; # # MDEV-10776: Server crash on query # diff --git a/mysql-test/main/subselect_no_opts.result b/mysql-test/main/subselect_no_opts.result index 09f664d3c28..ec4d0d99a6d 100644 --- a/mysql-test/main/subselect_no_opts.result +++ b/mysql-test/main/subselect_no_opts.result @@ -7125,7 +7125,7 @@ drop table t1,t2,t3,t4; # MDEV-7122 # Assertion `0' failed in subselect_hash_sj_engine::init # -SET SESSION big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a char(255) DEFAULT '', KEY(a(10))) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; INSERT INTO t1 VALUES(0),(0),(0); SELECT * FROM t1 WHERE a IN(SELECT MIN(a) FROM t1); @@ -7134,7 +7134,7 @@ a 0 0 DROP TABLE t1; -SET SESSION big_tables=0; +set tmp_memory_table_size=default; # # MDEV-10776: Server crash on query # diff --git a/mysql-test/main/subselect_no_scache.result b/mysql-test/main/subselect_no_scache.result index 765bb15a3df..f4c850409da 100644 --- a/mysql-test/main/subselect_no_scache.result +++ b/mysql-test/main/subselect_no_scache.result @@ -7140,7 +7140,7 @@ drop table t1,t2,t3,t4; # MDEV-7122 # Assertion `0' failed in subselect_hash_sj_engine::init # -SET SESSION big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a char(255) DEFAULT '', KEY(a(10))) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; INSERT INTO t1 VALUES(0),(0),(0); SELECT * FROM t1 WHERE a IN(SELECT MIN(a) FROM t1); @@ -7149,7 +7149,7 @@ a 0 0 DROP TABLE t1; -SET SESSION big_tables=0; +set tmp_memory_table_size=default; # # MDEV-10776: Server crash on query # diff --git a/mysql-test/main/subselect_no_semijoin.result b/mysql-test/main/subselect_no_semijoin.result index 97d2f3b058f..e1d147da761 100644 --- a/mysql-test/main/subselect_no_semijoin.result +++ b/mysql-test/main/subselect_no_semijoin.result @@ -7125,7 +7125,7 @@ drop table t1,t2,t3,t4; # MDEV-7122 # Assertion `0' failed in subselect_hash_sj_engine::init # -SET SESSION big_tables=1; +set tmp_memory_table_size=0; CREATE TABLE t1(a char(255) DEFAULT '', KEY(a(10))) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; INSERT INTO t1 VALUES(0),(0),(0); SELECT * FROM t1 WHERE a IN(SELECT MIN(a) FROM t1); @@ -7134,7 +7134,7 @@ a 0 0 DROP TABLE t1; -SET SESSION big_tables=0; +set tmp_memory_table_size=default; # # MDEV-10776: Server crash on query # diff --git a/mysql-test/main/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result index afc75a22962..6615eb41425 100644 --- a/mysql-test/main/subselect_sj_mat.result +++ b/mysql-test/main/subselect_sj_mat.result @@ -2154,8 +2154,7 @@ DROP VIEW v2; # # MDEV-5811: Server crashes in best_access_path with materialization+semijoin and big_tables=ON # -SET @tmp_mdev5811= @@big_tables; -SET big_tables = ON; +set tmp_memory_table_size=0; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2); CREATE TABLE t2 (b INT); @@ -2164,7 +2163,7 @@ SELECT * FROM t1 AS t1_1, t1 AS t1_2 WHERE ( t1_1.a, t1_2.a ) IN ( SELECT MAX(b), MIN(b) FROM t2 ); a a DROP TABLE t1,t2; -SET big_tables=@tmp_mdev5811; +set tmp_memory_table_size=default; # End of 5.3 tests # # MDEV-5056: Wrong result (extra rows) with materialization+semijoin, IN subqueries diff --git a/mysql-test/main/subselect_sj_mat.test b/mysql-test/main/subselect_sj_mat.test index 1de8701ecbb..8d5bbd8ef82 100644 --- a/mysql-test/main/subselect_sj_mat.test +++ b/mysql-test/main/subselect_sj_mat.test @@ -1760,8 +1760,7 @@ DROP VIEW v2; --echo # --echo # MDEV-5811: Server crashes in best_access_path with materialization+semijoin and big_tables=ON --echo # -SET @tmp_mdev5811= @@big_tables; -SET big_tables = ON; +set tmp_memory_table_size=0; # force on-disk tmp table CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2); @@ -1773,7 +1772,7 @@ SELECT * FROM t1 AS t1_1, t1 AS t1_2 WHERE ( t1_1.a, t1_2.a ) IN ( SELECT MAX(b), MIN(b) FROM t2 ); DROP TABLE t1,t2; -SET big_tables=@tmp_mdev5811; +set tmp_memory_table_size=default; --echo # End of 5.3 tests diff --git a/mysql-test/main/type_blob.result b/mysql-test/main/type_blob.result index cfb47f7b850..4dd416426c7 100644 --- a/mysql-test/main/type_blob.result +++ b/mysql-test/main/type_blob.result @@ -245,7 +245,7 @@ HELLO HELLO MY a hello -set big_tables=1; +set tmp_memory_table_size=0; select distinct t from t1; t NULL @@ -326,7 +326,7 @@ HELLO HELLO MY a hello -set big_tables=0; +set tmp_memory_table_size=default; select distinct * from t1; t c b d NULL NULL NULL NULL diff --git a/mysql-test/main/type_blob.test b/mysql-test/main/type_blob.test index df565b187b4..d81c2c644c4 100644 --- a/mysql-test/main/type_blob.test +++ b/mysql-test/main/type_blob.test @@ -112,7 +112,7 @@ select distinct t from t1 order by t; select distinct b from t1 order by b; select t from t1 group by t; select b from t1 group by b; -set big_tables=1; +set tmp_memory_table_size=0; # force on-disk tmp table select distinct t from t1; select distinct b from t1; select distinct t from t1 order by t; @@ -123,7 +123,7 @@ select distinct c from t1 order by c; select distinct d from t1 order by d; select c from t1 group by c; select d from t1 group by d; -set big_tables=0; +set tmp_memory_table_size=default; select distinct * from t1; select t,count(*) from t1 group by t; select b,count(*) from t1 group by b; diff --git a/mysql-test/main/variables.result b/mysql-test/main/variables.result index 4fb40d718b5..66acb163661 100644 --- a/mysql-test/main/variables.result +++ b/mysql-test/main/variables.result @@ -162,7 +162,6 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: Note 1003 select @@IDENTITY AS `@@IDENTITY`,last_insert_id() AS `last_insert_id()`,@@identity AS `@@identity` -set big_tables=OFF, big_tables=ON, big_tables=0, big_tables=1, big_tables="OFF", big_tables="ON"; set global concurrent_insert=2; show variables like 'concurrent_insert'; Variable_name Value @@ -422,18 +421,14 @@ SELECT @@version LIKE 'non-existent'; SELECT @@version_compile_os LIKE 'non-existent'; @@version_compile_os LIKE 'non-existent' 0 -set big_tables=OFFF; -ERROR 42000: Variable 'big_tables' can't be set to the value of 'OFFF' -set big_tables="OFFF"; -ERROR 42000: Variable 'big_tables' can't be set to the value of 'OFFF' set unknown_variable=1; ERROR HY000: Unknown system variable 'unknown_variable' set max_join_size="hello"; ERROR 42000: Incorrect argument type to variable 'max_join_size' set default_storage_engine=UNKNOWN_TABLE_TYPE; ERROR 42000: Unknown storage engine 'UNKNOWN_TABLE_TYPE' -set default_storage_engine=MERGE, big_tables=2; -ERROR 42000: Variable 'big_tables' can't be set to the value of '2' +set default_storage_engine=MERGE, sql_warnings=NULL; +ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'NULL' show local variables like 'default_storage_engine'; Variable_name Value default_storage_engine MEMORY @@ -456,10 +451,9 @@ ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and shoul set @@SQL_WARNINGS=NULL; ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'NULL' set autocommit=1; -set big_tables=1; -select @@autocommit, @@big_tables; -@@autocommit @@big_tables -1 1 +select @@autocommit; +@@autocommit +1 set global binlog_cache_size=100; Warnings: Warning 1292 Truncated incorrect binlog_cache_size value: '100' diff --git a/mysql-test/main/variables.test b/mysql-test/main/variables.test index b303958dff8..eab323dda3d 100644 --- a/mysql-test/main/variables.test +++ b/mysql-test/main/variables.test @@ -113,8 +113,6 @@ explain extended select last_insert_id(345); select @@IDENTITY,last_insert_id(), @@identity; explain extended select @@IDENTITY,last_insert_id(), @@identity; -set big_tables=OFF, big_tables=ON, big_tables=0, big_tables=1, big_tables="OFF", big_tables="ON"; - set global concurrent_insert=2; show variables like 'concurrent_insert'; select * from information_schema.session_variables where variable_name like 'concurrent_insert'; @@ -241,10 +239,6 @@ SELECT @@version_compile_os LIKE 'non-existent'; # The following should give errors ---error ER_WRONG_VALUE_FOR_VAR -set big_tables=OFFF; ---error ER_WRONG_VALUE_FOR_VAR -set big_tables="OFFF"; --error ER_UNKNOWN_SYSTEM_VARIABLE set unknown_variable=1; --error ER_WRONG_TYPE_FOR_VAR @@ -252,7 +246,7 @@ set max_join_size="hello"; --error ER_UNKNOWN_STORAGE_ENGINE set default_storage_engine=UNKNOWN_TABLE_TYPE; --error ER_WRONG_VALUE_FOR_VAR -set default_storage_engine=MERGE, big_tables=2; +set default_storage_engine=MERGE, sql_warnings=NULL; show local variables like 'default_storage_engine'; --error ER_UNKNOWN_CHARACTER_SET set character_set_client=UNKNOWN_CHARACTER_SET; @@ -276,8 +270,7 @@ set @@SQL_WARNINGS=NULL; # Test setting all variables set autocommit=1; -set big_tables=1; -select @@autocommit, @@big_tables; +select @@autocommit; set global binlog_cache_size=100; set bulk_insert_buffer_size=100; set character set cp1251_koi8; diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index 13f3761cdee..496cea70d81 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -5738,8 +5738,7 @@ drop view v60; # # MDEV-15572: view.test, server crash with --big-tables=1 # -set @save_big_tables=@@big_tables; -set big_tables=ON; +set tmp_memory_table_size=0; CREATE TABLE t1 ( f1 int , f2 int , f3 int , f4 int); CREATE TABLE t2 ( f1 int , f2 int , f3 int , f4 int); CREATE VIEW v1 AS @@ -5749,7 +5748,7 @@ SELECT f1, f2, f3, f4 FROM t1; ERROR HY000: Can not modify more than one base table through a join view 'test.v1' drop view v1; drop table t1, t2; -set big_tables=@save_big_tables; +set tmp_memory_table_size=default; # ----------------------------------------------------------------- # -- End of 5.5 tests. # ----------------------------------------------------------------- diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index 4fc87f6283c..6c9a6aa70c8 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -5628,8 +5628,7 @@ drop view v60; --echo # MDEV-15572: view.test, server crash with --big-tables=1 --echo # -set @save_big_tables=@@big_tables; -set big_tables=ON; +set tmp_memory_table_size=0; # force on-disk tmp table CREATE TABLE t1 ( f1 int , f2 int , f3 int , f4 int); CREATE TABLE t2 ( f1 int , f2 int , f3 int , f4 int); @@ -5642,7 +5641,7 @@ REPLACE INTO v1 (f1, f2, f3, f4) drop view v1; drop table t1, t2; -set big_tables=@save_big_tables; +set tmp_memory_table_size=default; --echo # ----------------------------------------------------------------- --echo # -- End of 5.5 tests. diff --git a/mysql-test/main/win.result b/mysql-test/main/win.result index 4adb5c84f1e..0eec38db611 100644 --- a/mysql-test/main/win.result +++ b/mysql-test/main/win.result @@ -1742,8 +1742,7 @@ drop table t1; # create table t1(a int); insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -set @tmp=@@big_tables; -set big_tables=1; +set tmp_memory_table_size=0; select rank() over (order by a) from t1; rank() over (order by a) 1 @@ -1756,7 +1755,7 @@ rank() over (order by a) 8 9 10 -set big_tables=@tmp; +set tmp_memory_table_size=default; drop table t1; # # Check if "ORDER BY window_func" works diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test index 3d5fb2240de..ef55f4bdbc7 100644 --- a/mysql-test/main/win.test +++ b/mysql-test/main/win.test @@ -1067,10 +1067,9 @@ drop table t1; --echo # create table t1(a int); insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -set @tmp=@@big_tables; -set big_tables=1; +set tmp_memory_table_size=0; # force on-disk tmp table select rank() over (order by a) from t1; -set big_tables=@tmp; +set tmp_memory_table_size=default; drop table t1; --echo # diff --git a/mysql-test/suite/sys_vars/r/big_tables_basic.result b/mysql-test/suite/sys_vars/r/big_tables_basic.result index 29781987d47..a4ee8e83e5e 100644 --- a/mysql-test/suite/sys_vars/r/big_tables_basic.result +++ b/mysql-test/suite/sys_vars/r/big_tables_basic.result @@ -4,16 +4,24 @@ SELECT @start_value; 0 '#--------------------FN_DYNVARS_005_01------------------------#' SET @@big_tables = 1; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SET @@big_tables = DEFAULT; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 0 '#--------------------FN_DYNVARS_005_02------------------------#' SET @@big_tables = 0; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 0 SET @@big_tables = 1; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 1 @@ -44,10 +52,14 @@ SET @@big_tables = ''; ERROR 42000: Variable 'big_tables' can't be set to the value of '' '#-------------------FN_DYNVARS_005_04----------------------------#' SET @@global.big_tables = 1-@@global.big_tables; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@global.big_tables; @@global.big_tables 1 SET @@global.big_tables = 1-@@global.big_tables; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release '#----------------------FN_DYNVARS_005_05------------------------#' SELECT IF(@@big_tables, "ON", "OFF") = VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES @@ -56,33 +68,47 @@ IF(@@big_tables, "ON", "OFF") = VARIABLE_VALUE 1 '#---------------------FN_DYNVARS_005_06----------------------#' SET @@big_tables = OFF; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 0 SET @@big_tables = ON; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 1 '#---------------------FN_DYNVARS_005_07----------------------#' SET @@big_tables = TRUE; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 1 SET @@big_tables = FALSE; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 0 '#---------------------FN_DYNVARS_005_08----------------------#' SET @@big_tables = 0; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables = @@session.big_tables; @@big_tables = @@session.big_tables 1 SET @@big_tables = 1; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables = @@local.big_tables and @@local.big_tables = @@session.big_tables; @@big_tables = @@local.big_tables and @@local.big_tables = @@session.big_tables 1 '#---------------------FN_DYNVARS_005_09----------------------#' SET big_tables = 1; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 1 @@ -93,6 +119,8 @@ ERROR 42S02: Unknown table 'session' in field list select big_tables; ERROR 42S22: Unknown column 'big_tables' in 'field list' SET @@big_tables = @start_value; +Warnings: +Warning 1287 '@@big_tables' is deprecated and will be removed in a future release SELECT @@big_tables; @@big_tables 0 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff index 2d72c262a21..02c4c717f6f 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff @@ -1,6 +1,6 @@ ---- sysvars_server_embedded.result -+++ sysvars_server_embedded.result -@@ -34,7 +34,7 @@ READ_ONLY NO +--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +@@ -35,7 +35,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -9,7 +9,7 @@ VARIABLE_COMMENT Block size to be used for Aria index pages. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 32768 -@@ -44,7 +44,7 @@ READ_ONLY YES +@@ -45,7 +45,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -18,7 +18,7 @@ VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -54,7 +54,7 @@ READ_ONLY NO +@@ -55,7 +55,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_LOG_ACTIVITY VARIABLE_SCOPE GLOBAL @@ -27,7 +27,7 @@ VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -74,7 +74,7 @@ READ_ONLY NO +@@ -75,7 +75,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_FORCE_START_AFTER_RECOVERY_FAILURES VARIABLE_SCOPE GLOBAL @@ -36,7 +36,7 @@ VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -94,7 +94,7 @@ READ_ONLY NO +@@ -95,7 +95,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_GROUP_COMMIT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -45,7 +45,7 @@ VARIABLE_COMMENT Interval between commite in microseconds (1/1000000c). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode. Option has only an effect if aria_group_commit is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -104,7 +104,7 @@ READ_ONLY NO +@@ -105,7 +105,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_LOG_FILE_SIZE VARIABLE_SCOPE GLOBAL @@ -54,7 +54,7 @@ VARIABLE_COMMENT Limit for transaction log size NUMERIC_MIN_VALUE 8388608 NUMERIC_MAX_VALUE 4294967295 -@@ -134,10 +134,10 @@ READ_ONLY NO +@@ -135,10 +135,10 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_AGE_THRESHOLD VARIABLE_SCOPE GLOBAL @@ -67,7 +67,7 @@ NUMERIC_BLOCK_SIZE 100 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -154,7 +154,7 @@ READ_ONLY YES +@@ -155,7 +155,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_DIVISION_LIMIT VARIABLE_SCOPE GLOBAL @@ -76,7 +76,7 @@ VARIABLE_COMMENT The minimum percentage of warm blocks in key cache NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -164,7 +164,7 @@ READ_ONLY NO +@@ -165,7 +165,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_FILE_HASH_SIZE VARIABLE_SCOPE GLOBAL @@ -85,7 +85,7 @@ VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files. NUMERIC_MIN_VALUE 128 NUMERIC_MAX_VALUE 16384 -@@ -194,7 +194,7 @@ READ_ONLY NO +@@ -195,7 +195,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -94,7 +94,7 @@ VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -207,7 +207,7 @@ VARIABLE_SCOPE SESSION +@@ -208,7 +208,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE. NUMERIC_MIN_VALUE 4096 @@ -103,7 +103,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -264,7 +264,7 @@ READ_ONLY NO +@@ -265,7 +265,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_INCREMENT VARIABLE_SCOPE SESSION @@ -112,7 +112,7 @@ VARIABLE_COMMENT Auto-increment columns are incremented by this NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -274,7 +274,7 @@ READ_ONLY NO +@@ -275,7 +275,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_OFFSET VARIABLE_SCOPE SESSION @@ -121,7 +121,7 @@ VARIABLE_COMMENT Offset added to Auto-increment columns. Used when auto-increment-increment != 1 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -284,7 +284,7 @@ READ_ONLY NO +@@ -285,7 +285,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BACK_LOG VARIABLE_SCOPE GLOBAL @@ -130,7 +130,7 @@ VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -337,7 +337,7 @@ VARIABLE_SCOPE GLOBAL +@@ -338,7 +338,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance NUMERIC_MIN_VALUE 4096 @@ -139,7 +139,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -354,20 +354,20 @@ READ_ONLY NO +@@ -355,20 +355,20 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_COMMIT_WAIT_COUNT VARIABLE_SCOPE GLOBAL @@ -164,7 +164,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -387,7 +387,7 @@ VARIABLE_SCOPE GLOBAL +@@ -388,7 +388,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of file cache for the binary log NUMERIC_MIN_VALUE 8192 @@ -173,7 +173,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -427,7 +427,7 @@ VARIABLE_SCOPE GLOBAL +@@ -438,7 +438,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -182,7 +182,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -437,7 +437,7 @@ VARIABLE_SCOPE SESSION +@@ -448,7 +448,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -191,7 +191,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -624,7 +624,7 @@ READ_ONLY NO +@@ -635,7 +635,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -200,7 +200,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -674,7 +674,7 @@ READ_ONLY YES +@@ -685,7 +685,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION @@ -209,7 +209,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -684,7 +684,7 @@ READ_ONLY NO +@@ -695,7 +695,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_SHORT VARIABLE_SCOPE SESSION @@ -218,7 +218,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -694,7 +694,7 @@ READ_ONLY NO +@@ -705,7 +705,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_LONG VARIABLE_SCOPE SESSION @@ -227,7 +227,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -704,7 +704,7 @@ READ_ONLY NO +@@ -715,7 +715,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_SHORT VARIABLE_SCOPE SESSION @@ -236,7 +236,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -754,7 +754,7 @@ READ_ONLY NO +@@ -765,7 +765,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME DEFAULT_WEEK_FORMAT VARIABLE_SCOPE SESSION @@ -245,7 +245,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -764,7 +764,7 @@ READ_ONLY NO +@@ -775,7 +775,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_LIMIT VARIABLE_SCOPE GLOBAL @@ -254,7 +254,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -774,7 +774,7 @@ READ_ONLY NO +@@ -785,7 +785,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -263,7 +263,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -784,7 +784,7 @@ READ_ONLY NO +@@ -795,7 +795,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_QUEUE_SIZE VARIABLE_SCOPE GLOBAL @@ -272,7 +272,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -814,7 +814,7 @@ READ_ONLY NO +@@ -825,7 +825,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME DIV_PRECISION_INCREMENT VARIABLE_SCOPE SESSION @@ -281,7 +281,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -894,7 +894,7 @@ READ_ONLY NO +@@ -905,7 +905,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME EXPIRE_LOGS_DAYS VARIABLE_SCOPE GLOBAL @@ -290,7 +290,7 @@ VARIABLE_COMMENT If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 99 -@@ -924,7 +924,7 @@ READ_ONLY YES +@@ -935,7 +935,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME EXTRA_MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -299,7 +299,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -954,7 +954,7 @@ READ_ONLY NO +@@ -965,7 +965,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME FLUSH_TIME VARIABLE_SCOPE GLOBAL @@ -308,7 +308,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -984,7 +984,7 @@ READ_ONLY NO +@@ -995,7 +995,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MAX_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -317,7 +317,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -994,7 +994,7 @@ READ_ONLY YES +@@ -1005,7 +1005,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MIN_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -326,7 +326,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1004,7 +1004,7 @@ READ_ONLY YES +@@ -1015,7 +1015,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_QUERY_EXPANSION_LIMIT VARIABLE_SCOPE GLOBAL @@ -335,7 +335,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1047,7 +1047,7 @@ VARIABLE_SCOPE SESSION +@@ -1058,7 +1058,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT() NUMERIC_MIN_VALUE 4 @@ -344,7 +344,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1174,7 +1174,7 @@ READ_ONLY YES +@@ -1185,7 +1185,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE VARIABLE_SCOPE SESSION @@ -353,7 +353,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1204,7 +1204,7 @@ READ_ONLY YES +@@ -1215,7 +1215,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HOST_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -362,7 +362,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1314,7 +1314,7 @@ READ_ONLY NO +@@ -1325,7 +1325,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME INTERACTIVE_TIMEOUT VARIABLE_SCOPE SESSION @@ -371,7 +371,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1347,7 +1347,7 @@ VARIABLE_SCOPE SESSION +@@ -1358,7 +1358,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -380,7 +380,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1364,7 +1364,7 @@ READ_ONLY NO +@@ -1375,7 +1375,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME JOIN_CACHE_LEVEL VARIABLE_SCOPE SESSION @@ -389,7 +389,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1387,7 +1387,7 @@ VARIABLE_SCOPE GLOBAL +@@ -1398,7 +1398,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -398,7 +398,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1544,7 +1544,7 @@ READ_ONLY YES +@@ -1555,7 +1555,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME LOCK_WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -407,7 +407,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1664,7 +1664,7 @@ READ_ONLY NO +@@ -1675,7 +1675,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_SCOPE SESSION @@ -416,7 +416,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1694,7 +1694,7 @@ READ_ONLY NO +@@ -1705,7 +1705,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION @@ -425,7 +425,7 @@ VARIABLE_COMMENT Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1744,7 +1744,7 @@ READ_ONLY NO +@@ -1755,7 +1755,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET VARIABLE_SCOPE SESSION @@ -434,7 +434,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -1757,14 +1757,14 @@ VARIABLE_SCOPE GLOBAL +@@ -1768,14 +1768,14 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the transactional cache NUMERIC_MIN_VALUE 4096 @@ -451,7 +451,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -1777,14 +1777,14 @@ VARIABLE_SCOPE GLOBAL +@@ -1788,14 +1788,14 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the statement cache NUMERIC_MIN_VALUE 4096 @@ -468,7 +468,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100000 -@@ -1794,7 +1794,7 @@ READ_ONLY NO +@@ -1805,7 +1805,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECT_ERRORS VARIABLE_SCOPE GLOBAL @@ -477,7 +477,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1804,7 +1804,7 @@ READ_ONLY NO +@@ -1815,7 +1815,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_DELAYED_THREADS VARIABLE_SCOPE SESSION @@ -486,7 +486,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1824,7 +1824,7 @@ READ_ONLY YES +@@ -1835,7 +1835,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_ERROR_COUNT VARIABLE_SCOPE SESSION @@ -495,7 +495,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -1837,14 +1837,14 @@ VARIABLE_SCOPE SESSION +@@ -1848,14 +1848,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -512,7 +512,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1864,7 +1864,7 @@ READ_ONLY NO +@@ -1875,7 +1875,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LENGTH_FOR_SORT_DATA VARIABLE_SCOPE SESSION @@ -521,7 +521,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -1904,7 +1904,7 @@ READ_ONLY NO +@@ -1905,7 +1905,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_RECURSIVE_ITERATIONS VARIABLE_SCOPE SESSION @@ -530,7 +530,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1917,14 +1917,14 @@ VARIABLE_SCOPE SESSION +@@ -1918,14 +1918,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum size of the container of a rowid filter NUMERIC_MIN_VALUE 1024 @@ -547,7 +547,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1944,7 +1944,7 @@ READ_ONLY NO +@@ -1945,7 +1945,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SORT_LENGTH VARIABLE_SCOPE SESSION @@ -556,7 +556,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -1954,7 +1954,7 @@ READ_ONLY NO +@@ -1955,7 +1955,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SP_RECURSION_DEPTH VARIABLE_SCOPE SESSION @@ -565,7 +565,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1974,7 +1974,7 @@ READ_ONLY NO +@@ -1975,7 +1975,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_TMP_TABLES VARIABLE_SCOPE SESSION @@ -574,7 +574,7 @@ VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1994,7 +1994,7 @@ READ_ONLY NO +@@ -1995,7 +1995,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL @@ -583,7 +583,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2004,7 +2004,7 @@ READ_ONLY NO +@@ -2005,7 +2005,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -592,7 +592,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2014,7 +2014,7 @@ READ_ONLY YES +@@ -2015,7 +2015,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_HASH_INSTANCES VARIABLE_SCOPE GLOBAL @@ -601,7 +601,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2024,7 +2024,7 @@ READ_ONLY YES +@@ -2025,7 +2025,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -610,7 +610,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2034,7 +2034,7 @@ READ_ONLY NO +@@ -2035,7 +2035,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MRR_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -619,7 +619,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2044,17 +2044,17 @@ READ_ONLY NO +@@ -2045,17 +2045,17 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MULTI_RANGE_COUNT VARIABLE_SCOPE SESSION @@ -640,7 +640,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2064,7 +2064,7 @@ READ_ONLY YES +@@ -2065,7 +2065,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_DATA_POINTER_SIZE VARIABLE_SCOPE GLOBAL @@ -649,7 +649,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2087,7 +2087,7 @@ VARIABLE_SCOPE GLOBAL +@@ -2088,7 +2088,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables NUMERIC_MIN_VALUE 7 @@ -658,7 +658,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2104,10 +2104,10 @@ READ_ONLY YES +@@ -2105,10 +2105,10 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MYISAM_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -671,7 +671,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2117,7 +2117,7 @@ VARIABLE_SCOPE SESSION +@@ -2118,7 +2118,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -680,7 +680,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2154,7 +2154,7 @@ READ_ONLY NO +@@ -2155,7 +2155,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME NET_BUFFER_LENGTH VARIABLE_SCOPE SESSION @@ -689,7 +689,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2164,7 +2164,7 @@ READ_ONLY NO +@@ -2165,7 +2165,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_READ_TIMEOUT VARIABLE_SCOPE SESSION @@ -698,7 +698,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2174,7 +2174,7 @@ READ_ONLY NO +@@ -2175,7 +2175,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_RETRY_COUNT VARIABLE_SCOPE SESSION @@ -707,7 +707,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2184,7 +2184,7 @@ READ_ONLY NO +@@ -2185,7 +2185,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_WRITE_TIMEOUT VARIABLE_SCOPE SESSION @@ -716,7 +716,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2234,7 +2234,7 @@ READ_ONLY NO +@@ -2235,7 +2235,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -725,7 +725,7 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2244,7 +2244,7 @@ READ_ONLY YES +@@ -2245,7 +2245,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_PRUNE_LEVEL VARIABLE_SCOPE SESSION @@ -734,7 +734,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1 -@@ -2254,7 +2254,7 @@ READ_ONLY NO +@@ -2255,7 +2255,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION @@ -743,7 +743,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2264,7 +2264,7 @@ READ_ONLY NO +@@ -2265,7 +2265,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SELECTIVITY_SAMPLING_LIMIT VARIABLE_SCOPE SESSION @@ -752,7 +752,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2294,17 +2294,17 @@ READ_ONLY NO +@@ -2295,17 +2295,17 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE_MAX_MEM_SIZE VARIABLE_SCOPE SESSION @@ -773,7 +773,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2324,7 +2324,7 @@ READ_ONLY YES +@@ -2325,7 +2325,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME PERFORMANCE_SCHEMA_ACCOUNTS_SIZE VARIABLE_SCOPE GLOBAL @@ -782,7 +782,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2334,7 +2334,7 @@ READ_ONLY YES +@@ -2335,7 +2335,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_DIGESTS_SIZE VARIABLE_SCOPE GLOBAL @@ -791,7 +791,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 200 -@@ -2344,7 +2344,7 @@ READ_ONLY YES +@@ -2345,7 +2345,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -800,7 +800,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2354,7 +2354,7 @@ READ_ONLY YES +@@ -2355,7 +2355,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -809,7 +809,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2364,7 +2364,7 @@ READ_ONLY YES +@@ -2365,7 +2365,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -818,7 +818,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2374,7 +2374,7 @@ READ_ONLY YES +@@ -2375,7 +2375,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -827,7 +827,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2384,7 +2384,7 @@ READ_ONLY YES +@@ -2385,7 +2385,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -836,7 +836,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2394,7 +2394,7 @@ READ_ONLY YES +@@ -2395,7 +2395,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -845,7 +845,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2404,7 +2404,7 @@ READ_ONLY YES +@@ -2405,7 +2405,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_HOSTS_SIZE VARIABLE_SCOPE GLOBAL @@ -854,7 +854,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2414,7 +2414,7 @@ READ_ONLY YES +@@ -2415,7 +2415,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_CLASSES VARIABLE_SCOPE GLOBAL @@ -863,7 +863,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2424,7 +2424,7 @@ READ_ONLY YES +@@ -2425,7 +2425,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_INSTANCES VARIABLE_SCOPE GLOBAL @@ -872,7 +872,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2434,7 +2434,7 @@ READ_ONLY YES +@@ -2435,7 +2435,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH VARIABLE_SCOPE GLOBAL @@ -881,7 +881,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2444,7 +2444,7 @@ READ_ONLY YES +@@ -2445,7 +2445,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES VARIABLE_SCOPE GLOBAL @@ -890,7 +890,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2454,7 +2454,7 @@ READ_ONLY YES +@@ -2455,7 +2455,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_HANDLES VARIABLE_SCOPE GLOBAL @@ -899,7 +899,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2464,7 +2464,7 @@ READ_ONLY YES +@@ -2465,7 +2465,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -908,7 +908,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2474,7 +2474,7 @@ READ_ONLY YES +@@ -2475,7 +2475,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES VARIABLE_SCOPE GLOBAL @@ -917,7 +917,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2484,7 +2484,7 @@ READ_ONLY YES +@@ -2485,7 +2485,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES VARIABLE_SCOPE GLOBAL @@ -926,7 +926,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2494,7 +2494,7 @@ READ_ONLY YES +@@ -2495,7 +2495,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES VARIABLE_SCOPE GLOBAL @@ -935,7 +935,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2504,7 +2504,7 @@ READ_ONLY YES +@@ -2505,7 +2505,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES VARIABLE_SCOPE GLOBAL @@ -944,7 +944,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2514,7 +2514,7 @@ READ_ONLY YES +@@ -2515,7 +2515,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES VARIABLE_SCOPE GLOBAL @@ -953,7 +953,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2524,7 +2524,7 @@ READ_ONLY YES +@@ -2525,7 +2525,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES VARIABLE_SCOPE GLOBAL @@ -962,7 +962,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2534,7 +2534,7 @@ READ_ONLY YES +@@ -2535,7 +2535,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES VARIABLE_SCOPE GLOBAL @@ -971,7 +971,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2544,7 +2544,7 @@ READ_ONLY YES +@@ -2545,7 +2545,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES VARIABLE_SCOPE GLOBAL @@ -980,7 +980,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2554,7 +2554,7 @@ READ_ONLY YES +@@ -2555,7 +2555,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES VARIABLE_SCOPE GLOBAL @@ -989,7 +989,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2564,7 +2564,7 @@ READ_ONLY YES +@@ -2565,7 +2565,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -998,7 +998,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2574,7 +2574,7 @@ READ_ONLY YES +@@ -2575,7 +2575,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES VARIABLE_SCOPE GLOBAL @@ -1007,7 +1007,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2584,7 +2584,7 @@ READ_ONLY YES +@@ -2585,7 +2585,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1016,7 +1016,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2594,7 +2594,7 @@ READ_ONLY YES +@@ -2595,7 +2595,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE VARIABLE_SCOPE GLOBAL @@ -1025,7 +1025,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2604,7 +2604,7 @@ READ_ONLY YES +@@ -2605,7 +2605,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE VARIABLE_SCOPE GLOBAL @@ -1034,7 +1034,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -2614,7 +2614,7 @@ READ_ONLY YES +@@ -2615,7 +2615,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE VARIABLE_SCOPE GLOBAL @@ -1043,7 +1043,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2624,7 +2624,7 @@ READ_ONLY YES +@@ -2625,7 +2625,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_USERS_SIZE VARIABLE_SCOPE GLOBAL @@ -1052,7 +1052,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2674,7 +2674,7 @@ READ_ONLY YES +@@ -2675,7 +2675,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PRELOAD_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1061,7 +1061,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2694,7 +2694,7 @@ READ_ONLY NO +@@ -2695,7 +2695,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROFILING_HISTORY_SIZE VARIABLE_SCOPE SESSION @@ -1070,7 +1070,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -2704,7 +2704,7 @@ READ_ONLY NO +@@ -2705,7 +2705,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PROGRESS_REPORT_TIME VARIABLE_SCOPE SESSION @@ -1079,7 +1079,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2764,7 +2764,7 @@ READ_ONLY NO +@@ -2765,7 +2765,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME QUERY_ALLOC_BLOCK_SIZE VARIABLE_SCOPE SESSION @@ -1088,7 +1088,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2774,7 +2774,7 @@ READ_ONLY NO +@@ -2775,7 +2775,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_LIMIT VARIABLE_SCOPE GLOBAL @@ -1097,7 +1097,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2784,7 +2784,7 @@ READ_ONLY NO +@@ -2785,7 +2785,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_MIN_RES_UNIT VARIABLE_SCOPE GLOBAL @@ -1106,7 +1106,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2797,7 +2797,7 @@ VARIABLE_SCOPE GLOBAL +@@ -2798,7 +2798,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1115,7 +1115,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2834,7 +2834,7 @@ READ_ONLY NO +@@ -2835,7 +2835,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME QUERY_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1124,7 +1124,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2847,7 +2847,7 @@ VARIABLE_SCOPE SESSION ONLY +@@ -2848,7 +2848,7 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1133,7 +1133,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2857,14 +2857,14 @@ VARIABLE_SCOPE SESSION ONLY +@@ -2858,14 +2858,14 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1150,7 +1150,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -2874,7 +2874,7 @@ READ_ONLY NO +@@ -2875,7 +2875,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME READ_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1159,7 +1159,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2894,7 +2894,7 @@ READ_ONLY NO +@@ -2895,7 +2895,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME READ_RND_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1168,7 +1168,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -2904,10 +2904,10 @@ READ_ONLY NO +@@ -2905,10 +2905,10 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ROWID_MERGE_BUFF_SIZE VARIABLE_SCOPE SESSION @@ -1181,7 +1181,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2944,7 +2944,7 @@ READ_ONLY YES +@@ -2945,7 +2945,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SERVER_ID VARIABLE_SCOPE SESSION @@ -1190,7 +1190,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3014,7 +3014,7 @@ READ_ONLY NO +@@ -3015,7 +3015,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL @@ -1199,7 +1199,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3024,7 +3024,7 @@ READ_ONLY NO +@@ -3025,7 +3025,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLOW_LAUNCH_TIME VARIABLE_SCOPE GLOBAL @@ -1208,7 +1208,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3067,7 +3067,7 @@ VARIABLE_SCOPE SESSION +@@ -3068,7 +3068,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1217,7 +1217,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3274,7 +3274,7 @@ READ_ONLY NO +@@ -3275,7 +3275,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME STORED_PROGRAM_CACHE VARIABLE_SCOPE GLOBAL @@ -1226,7 +1226,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -3354,7 +3354,7 @@ READ_ONLY NO +@@ -3355,7 +3355,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TABLE_DEFINITION_CACHE VARIABLE_SCOPE GLOBAL @@ -1235,7 +1235,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 2097152 -@@ -3364,7 +3364,7 @@ READ_ONLY NO +@@ -3365,7 +3365,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TABLE_OPEN_CACHE VARIABLE_SCOPE GLOBAL @@ -1244,7 +1244,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1048576 -@@ -3424,7 +3424,7 @@ READ_ONLY NO +@@ -3425,7 +3425,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -1253,7 +1253,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -3434,7 +3434,7 @@ READ_ONLY NO +@@ -3435,7 +3435,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME THREAD_CONCURRENCY VARIABLE_SCOPE GLOBAL @@ -1262,7 +1262,7 @@ VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 512 -@@ -3527,7 +3527,7 @@ VARIABLE_SCOPE SESSION +@@ -3528,7 +3528,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1271,19 +1271,19 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3537,7 +3537,7 @@ VARIABLE_SCOPE SESSION +@@ -3538,7 +3538,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. - NUMERIC_MIN_VALUE 1024 + NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3547,14 +3547,14 @@ VARIABLE_SCOPE SESSION +@@ -3548,14 +3548,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. - NUMERIC_MIN_VALUE 1024 + NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -1297,7 +1297,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -3564,7 +3564,7 @@ READ_ONLY NO +@@ -3565,7 +3565,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1306,7 +1306,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -3704,7 +3704,7 @@ READ_ONLY YES +@@ -3705,7 +3705,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -1315,7 +1315,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -3731,7 +3731,7 @@ order by variable_name; +@@ -3732,7 +3732,7 @@ order by variable_name; VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 7176c1ad4be..9ed579fb632 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -3537,7 +3537,7 @@ VARIABLE_NAME TMP_MEMORY_TABLE_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. -NUMERIC_MIN_VALUE 1024 +NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL @@ -3547,7 +3547,7 @@ VARIABLE_NAME TMP_TABLE_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. -NUMERIC_MIN_VALUE 1024 +NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff index 31967729cc4..51809a1740c 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff @@ -1,6 +1,6 @@ ---- sysvars_server_notembedded.result -+++ sysvars_server_notembedded.result -@@ -34,7 +34,7 @@ READ_ONLY NO +--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +@@ -35,7 +35,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_BLOCK_SIZE VARIABLE_SCOPE GLOBAL @@ -9,7 +9,7 @@ VARIABLE_COMMENT Block size to be used for Aria index pages. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 32768 -@@ -44,7 +44,7 @@ READ_ONLY YES +@@ -45,7 +45,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -18,7 +18,7 @@ VARIABLE_COMMENT Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -54,7 +54,7 @@ READ_ONLY NO +@@ -55,7 +55,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_CHECKPOINT_LOG_ACTIVITY VARIABLE_SCOPE GLOBAL @@ -27,7 +27,7 @@ VARIABLE_COMMENT Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -74,7 +74,7 @@ READ_ONLY NO +@@ -75,7 +75,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_FORCE_START_AFTER_RECOVERY_FAILURES VARIABLE_SCOPE GLOBAL @@ -36,7 +36,7 @@ VARIABLE_COMMENT Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -94,7 +94,7 @@ READ_ONLY NO +@@ -95,7 +95,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_GROUP_COMMIT_INTERVAL VARIABLE_SCOPE GLOBAL @@ -45,7 +45,7 @@ VARIABLE_COMMENT Interval between commite in microseconds (1/1000000c). 0 stands for no waiting for other threads to come and do a commit in "hard" mode and no sync()/commit at all in "soft" mode. Option has only an effect if aria_group_commit is used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -104,7 +104,7 @@ READ_ONLY NO +@@ -105,7 +105,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_LOG_FILE_SIZE VARIABLE_SCOPE GLOBAL @@ -54,7 +54,7 @@ VARIABLE_COMMENT Limit for transaction log size NUMERIC_MIN_VALUE 8388608 NUMERIC_MAX_VALUE 4294967295 -@@ -134,10 +134,10 @@ READ_ONLY NO +@@ -135,10 +135,10 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_AGE_THRESHOLD VARIABLE_SCOPE GLOBAL @@ -67,7 +67,7 @@ NUMERIC_BLOCK_SIZE 100 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -154,7 +154,7 @@ READ_ONLY YES +@@ -155,7 +155,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_DIVISION_LIMIT VARIABLE_SCOPE GLOBAL @@ -76,7 +76,7 @@ VARIABLE_COMMENT The minimum percentage of warm blocks in key cache NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -164,7 +164,7 @@ READ_ONLY NO +@@ -165,7 +165,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_PAGECACHE_FILE_HASH_SIZE VARIABLE_SCOPE GLOBAL @@ -85,7 +85,7 @@ VARIABLE_COMMENT Number of hash buckets for open and changed files. If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files. NUMERIC_MIN_VALUE 128 NUMERIC_MAX_VALUE 16384 -@@ -194,7 +194,7 @@ READ_ONLY NO +@@ -195,7 +195,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME ARIA_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -94,7 +94,7 @@ VARIABLE_COMMENT Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -207,7 +207,7 @@ VARIABLE_SCOPE SESSION +@@ -208,7 +208,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE. NUMERIC_MIN_VALUE 4096 @@ -103,7 +103,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -264,7 +264,7 @@ READ_ONLY NO +@@ -265,7 +265,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_INCREMENT VARIABLE_SCOPE SESSION @@ -112,7 +112,7 @@ VARIABLE_COMMENT Auto-increment columns are incremented by this NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -274,7 +274,7 @@ READ_ONLY NO +@@ -275,7 +275,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME AUTO_INCREMENT_OFFSET VARIABLE_SCOPE SESSION @@ -121,7 +121,7 @@ VARIABLE_COMMENT Offset added to Auto-increment columns. Used when auto-increment-increment != 1 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 65535 -@@ -284,7 +284,7 @@ READ_ONLY NO +@@ -285,7 +285,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BACK_LOG VARIABLE_SCOPE GLOBAL @@ -130,7 +130,7 @@ VARIABLE_COMMENT The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets very many connection requests in a very short time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -337,7 +337,7 @@ VARIABLE_SCOPE GLOBAL +@@ -338,7 +338,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the transactional cache for updates to transactional engines for the binary log. If you often use transactions containing many statements, you can increase this to get more performance NUMERIC_MIN_VALUE 4096 @@ -139,7 +139,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -354,20 +354,20 @@ READ_ONLY NO +@@ -355,20 +355,20 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME BINLOG_COMMIT_WAIT_COUNT VARIABLE_SCOPE GLOBAL @@ -164,7 +164,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -387,7 +387,7 @@ VARIABLE_SCOPE GLOBAL +@@ -388,7 +388,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of file cache for the binary log NUMERIC_MIN_VALUE 8192 @@ -173,7 +173,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -427,7 +427,7 @@ VARIABLE_SCOPE GLOBAL +@@ -438,7 +438,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the statement cache for updates to non-transactional engines for the binary log. If you often use statements updating a great number of rows, you can increase this to get more performance. NUMERIC_MIN_VALUE 4096 @@ -182,7 +182,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -437,7 +437,7 @@ VARIABLE_SCOPE SESSION +@@ -448,7 +448,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread! NUMERIC_MIN_VALUE 0 @@ -191,7 +191,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -624,7 +624,7 @@ READ_ONLY NO +@@ -635,7 +635,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME CONNECT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -200,7 +200,7 @@ VARIABLE_COMMENT The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake' NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 31536000 -@@ -674,7 +674,7 @@ READ_ONLY YES +@@ -685,7 +685,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_LONG VARIABLE_SCOPE SESSION @@ -209,7 +209,7 @@ VARIABLE_COMMENT Long search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 33 -@@ -684,7 +684,7 @@ READ_ONLY NO +@@ -695,7 +695,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_SEARCH_DEPTH_SHORT VARIABLE_SCOPE SESSION @@ -218,7 +218,7 @@ VARIABLE_COMMENT Short search depth for the two-step deadlock detection NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 32 -@@ -694,7 +694,7 @@ READ_ONLY NO +@@ -705,7 +705,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_LONG VARIABLE_SCOPE SESSION @@ -227,7 +227,7 @@ VARIABLE_COMMENT Long timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -704,7 +704,7 @@ READ_ONLY NO +@@ -715,7 +715,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DEADLOCK_TIMEOUT_SHORT VARIABLE_SCOPE SESSION @@ -236,7 +236,7 @@ VARIABLE_COMMENT Short timeout for the two-step deadlock detection (in microseconds) NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -764,7 +764,7 @@ READ_ONLY NO +@@ -775,7 +775,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME DEFAULT_WEEK_FORMAT VARIABLE_SCOPE SESSION @@ -245,7 +245,7 @@ VARIABLE_COMMENT The default week format used by WEEK() functions NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 7 -@@ -774,7 +774,7 @@ READ_ONLY NO +@@ -785,7 +785,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_LIMIT VARIABLE_SCOPE GLOBAL @@ -254,7 +254,7 @@ VARIABLE_COMMENT After inserting delayed_insert_limit rows, the INSERT DELAYED handler will check if there are any SELECT statements pending. If so, it allows these to execute before continuing. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -784,7 +784,7 @@ READ_ONLY NO +@@ -795,7 +795,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_INSERT_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -263,7 +263,7 @@ VARIABLE_COMMENT How long a INSERT DELAYED thread should wait for INSERT statements before terminating NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -794,7 +794,7 @@ READ_ONLY NO +@@ -805,7 +805,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME DELAYED_QUEUE_SIZE VARIABLE_SCOPE GLOBAL @@ -272,7 +272,7 @@ VARIABLE_COMMENT What size queue (in rows) should be allocated for handling INSERT DELAYED. If the queue becomes full, any client that does INSERT DELAYED will wait until there is room in the queue again NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -824,7 +824,7 @@ READ_ONLY NO +@@ -835,7 +835,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME DIV_PRECISION_INCREMENT VARIABLE_SCOPE SESSION @@ -281,7 +281,7 @@ VARIABLE_COMMENT Precision of the result of '/' operator will be increased on that value NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 38 -@@ -914,7 +914,7 @@ READ_ONLY NO +@@ -925,7 +925,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME EXPIRE_LOGS_DAYS VARIABLE_SCOPE GLOBAL @@ -290,7 +290,7 @@ VARIABLE_COMMENT If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 99 -@@ -944,7 +944,7 @@ READ_ONLY YES +@@ -955,7 +955,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME EXTRA_MAX_CONNECTIONS VARIABLE_SCOPE GLOBAL @@ -299,7 +299,7 @@ VARIABLE_COMMENT The number of connections on extra-port NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100000 -@@ -974,7 +974,7 @@ READ_ONLY NO +@@ -985,7 +985,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME FLUSH_TIME VARIABLE_SCOPE GLOBAL @@ -308,7 +308,7 @@ VARIABLE_COMMENT A dedicated thread is created to flush all tables at the given interval NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1004,7 +1004,7 @@ READ_ONLY NO +@@ -1015,7 +1015,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MAX_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -317,7 +317,7 @@ VARIABLE_COMMENT The maximum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1014,7 +1014,7 @@ READ_ONLY YES +@@ -1025,7 +1025,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_MIN_WORD_LEN VARIABLE_SCOPE GLOBAL @@ -326,7 +326,7 @@ VARIABLE_COMMENT The minimum length of the word to be included in a FULLTEXT index. Note: FULLTEXT indexes must be rebuilt after changing this variable NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 84 -@@ -1024,7 +1024,7 @@ READ_ONLY YES +@@ -1035,7 +1035,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME FT_QUERY_EXPANSION_LIMIT VARIABLE_SCOPE GLOBAL @@ -335,7 +335,7 @@ VARIABLE_COMMENT Number of best matches to use for query expansion NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -1067,7 +1067,7 @@ VARIABLE_SCOPE SESSION +@@ -1078,7 +1078,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT() NUMERIC_MIN_VALUE 4 @@ -344,7 +344,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1274,7 +1274,7 @@ READ_ONLY YES +@@ -1285,7 +1285,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE VARIABLE_SCOPE SESSION @@ -353,7 +353,7 @@ VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -1304,7 +1304,7 @@ READ_ONLY YES +@@ -1315,7 +1315,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HOST_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -362,7 +362,7 @@ VARIABLE_COMMENT How many host names should be cached to avoid resolving. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65536 -@@ -1414,7 +1414,7 @@ READ_ONLY NO +@@ -1425,7 +1425,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME INTERACTIVE_TIMEOUT VARIABLE_SCOPE SESSION @@ -371,7 +371,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on an interactive connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -1447,7 +1447,7 @@ VARIABLE_SCOPE SESSION +@@ -1458,7 +1458,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer that is used for joins NUMERIC_MIN_VALUE 128 @@ -380,7 +380,7 @@ NUMERIC_BLOCK_SIZE 128 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1464,7 +1464,7 @@ READ_ONLY NO +@@ -1475,7 +1475,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME JOIN_CACHE_LEVEL VARIABLE_SCOPE SESSION @@ -389,7 +389,7 @@ VARIABLE_COMMENT Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers while even numbers are used for linked buffers NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 8 -@@ -1487,7 +1487,7 @@ VARIABLE_SCOPE GLOBAL +@@ -1498,7 +1498,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford NUMERIC_MIN_VALUE 0 @@ -398,7 +398,7 @@ NUMERIC_BLOCK_SIZE 4096 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1654,7 +1654,7 @@ READ_ONLY YES +@@ -1665,7 +1665,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME LOCK_WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -407,7 +407,7 @@ VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -1804,7 +1804,7 @@ READ_ONLY NO +@@ -1815,7 +1815,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_SLOW_RATE_LIMIT VARIABLE_SCOPE SESSION @@ -416,7 +416,7 @@ VARIABLE_COMMENT Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or the performance impact of slow logging NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1834,7 +1834,7 @@ READ_ONLY NO +@@ -1845,7 +1845,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME LOG_WARNINGS VARIABLE_SCOPE SESSION @@ -425,7 +425,7 @@ VARIABLE_COMMENT Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1894,7 +1894,7 @@ READ_ONLY NO +@@ -1905,7 +1905,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET VARIABLE_SCOPE SESSION @@ -434,7 +434,7 @@ VARIABLE_COMMENT Max packet length to send to or receive from the server NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -1907,14 +1907,14 @@ VARIABLE_SCOPE GLOBAL +@@ -1918,14 +1918,14 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the transactional cache NUMERIC_MIN_VALUE 4096 @@ -451,7 +451,7 @@ VARIABLE_COMMENT Binary log will be rotated automatically when the size exceeds this value. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 1073741824 -@@ -1927,14 +1927,14 @@ VARIABLE_SCOPE GLOBAL +@@ -1938,14 +1938,14 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the total size of the statement cache NUMERIC_MIN_VALUE 4096 @@ -468,7 +468,7 @@ VARIABLE_COMMENT The number of simultaneous clients allowed NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100000 -@@ -1944,7 +1944,7 @@ READ_ONLY NO +@@ -1955,7 +1955,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_CONNECT_ERRORS VARIABLE_SCOPE GLOBAL @@ -477,7 +477,7 @@ VARIABLE_COMMENT If there is more than this number of interrupted connections from a host this host will be blocked from further connections NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1954,7 +1954,7 @@ READ_ONLY NO +@@ -1965,7 +1965,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_DELAYED_THREADS VARIABLE_SCOPE SESSION @@ -486,7 +486,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -1974,7 +1974,7 @@ READ_ONLY YES +@@ -1985,7 +1985,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_ERROR_COUNT VARIABLE_SCOPE SESSION @@ -495,7 +495,7 @@ VARIABLE_COMMENT Max number of errors/warnings to store for a statement NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 65535 -@@ -1987,14 +1987,14 @@ VARIABLE_SCOPE SESSION +@@ -1998,14 +1998,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Don't allow creation of heap tables bigger than this NUMERIC_MIN_VALUE 16384 @@ -512,7 +512,7 @@ VARIABLE_COMMENT Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero INSERT DELAYED will be not used NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -2014,7 +2014,7 @@ READ_ONLY NO +@@ -2025,7 +2025,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LENGTH_FOR_SORT_DATA VARIABLE_SCOPE SESSION @@ -521,7 +521,7 @@ VARIABLE_COMMENT Max number of bytes in sorted records NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2054,7 +2054,7 @@ READ_ONLY NO +@@ -2055,7 +2055,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_RECURSIVE_ITERATIONS VARIABLE_SCOPE SESSION @@ -530,7 +530,7 @@ VARIABLE_COMMENT Maximum number of iterations when executing recursive queries NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2077,14 +2077,14 @@ VARIABLE_SCOPE SESSION +@@ -2078,14 +2078,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum size of the container of a rowid filter NUMERIC_MIN_VALUE 1024 @@ -547,7 +547,7 @@ VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2104,7 +2104,7 @@ READ_ONLY NO +@@ -2105,7 +2105,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SORT_LENGTH VARIABLE_SCOPE SESSION @@ -556,7 +556,7 @@ VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) NUMERIC_MIN_VALUE 4 NUMERIC_MAX_VALUE 8388608 -@@ -2114,7 +2114,7 @@ READ_ONLY NO +@@ -2115,7 +2115,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_SP_RECURSION_DEPTH VARIABLE_SCOPE SESSION @@ -565,7 +565,7 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2134,7 +2134,7 @@ READ_ONLY NO +@@ -2135,7 +2135,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_TMP_TABLES VARIABLE_SCOPE SESSION @@ -574,7 +574,7 @@ VARIABLE_COMMENT Unused, will be removed. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2154,7 +2154,7 @@ READ_ONLY NO +@@ -2155,7 +2155,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_WRITE_LOCK_COUNT VARIABLE_SCOPE GLOBAL @@ -583,7 +583,7 @@ VARIABLE_COMMENT After this many write locks, allow some read locks to run in between NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2164,7 +2164,7 @@ READ_ONLY NO +@@ -2165,7 +2165,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -592,7 +592,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1048576 -@@ -2174,7 +2174,7 @@ READ_ONLY YES +@@ -2175,7 +2175,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME METADATA_LOCKS_HASH_INSTANCES VARIABLE_SCOPE GLOBAL @@ -601,7 +601,7 @@ VARIABLE_COMMENT Unused NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2184,7 +2184,7 @@ READ_ONLY YES +@@ -2185,7 +2185,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MIN_EXAMINED_ROW_LIMIT VARIABLE_SCOPE SESSION @@ -610,7 +610,7 @@ VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2194,7 +2194,7 @@ READ_ONLY NO +@@ -2195,7 +2195,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MRR_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -619,7 +619,7 @@ VARIABLE_COMMENT Size of buffer to use when using MRR with range access NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -2204,17 +2204,17 @@ READ_ONLY NO +@@ -2205,17 +2205,17 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MULTI_RANGE_COUNT VARIABLE_SCOPE SESSION @@ -640,7 +640,7 @@ VARIABLE_COMMENT Block size to be used for MyISAM index pages NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 16384 -@@ -2224,7 +2224,7 @@ READ_ONLY YES +@@ -2225,7 +2225,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_DATA_POINTER_SIZE VARIABLE_SCOPE GLOBAL @@ -649,7 +649,7 @@ VARIABLE_COMMENT Default pointer size to be used for MyISAM tables NUMERIC_MIN_VALUE 2 NUMERIC_MAX_VALUE 7 -@@ -2247,7 +2247,7 @@ VARIABLE_SCOPE GLOBAL +@@ -2248,7 +2248,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Restricts the total memory used for memory mapping of MySQL tables NUMERIC_MIN_VALUE 7 @@ -658,7 +658,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2264,10 +2264,10 @@ READ_ONLY YES +@@ -2265,10 +2265,10 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MYISAM_REPAIR_THREADS VARIABLE_SCOPE SESSION @@ -671,7 +671,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2277,7 +2277,7 @@ VARIABLE_SCOPE SESSION +@@ -2278,7 +2278,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE NUMERIC_MIN_VALUE 4096 @@ -680,7 +680,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2314,7 +2314,7 @@ READ_ONLY NO +@@ -2315,7 +2315,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME NET_BUFFER_LENGTH VARIABLE_SCOPE SESSION @@ -689,7 +689,7 @@ VARIABLE_COMMENT Buffer length for TCP/IP and socket communication NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1048576 -@@ -2324,7 +2324,7 @@ READ_ONLY NO +@@ -2325,7 +2325,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_READ_TIMEOUT VARIABLE_SCOPE SESSION @@ -698,7 +698,7 @@ VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2334,7 +2334,7 @@ READ_ONLY NO +@@ -2335,7 +2335,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_RETRY_COUNT VARIABLE_SCOPE SESSION @@ -707,7 +707,7 @@ VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -2344,7 +2344,7 @@ READ_ONLY NO +@@ -2345,7 +2345,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME NET_WRITE_TIMEOUT VARIABLE_SCOPE SESSION @@ -716,7 +716,7 @@ VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -2394,7 +2394,7 @@ READ_ONLY NO +@@ -2395,7 +2395,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_SCOPE GLOBAL @@ -725,7 +725,7 @@ VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2404,7 +2404,7 @@ READ_ONLY YES +@@ -2405,7 +2405,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_PRUNE_LEVEL VARIABLE_SCOPE SESSION @@ -734,7 +734,7 @@ VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1 -@@ -2414,7 +2414,7 @@ READ_ONLY NO +@@ -2415,7 +2415,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION @@ -743,7 +743,7 @@ VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 62 -@@ -2424,7 +2424,7 @@ READ_ONLY NO +@@ -2425,7 +2425,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SELECTIVITY_SAMPLING_LIMIT VARIABLE_SCOPE SESSION @@ -752,7 +752,7 @@ VARIABLE_COMMENT Controls number of record samples to check condition selectivity NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 4294967295 -@@ -2454,17 +2454,17 @@ READ_ONLY NO +@@ -2455,17 +2455,17 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_TRACE_MAX_MEM_SIZE VARIABLE_SCOPE SESSION @@ -773,7 +773,7 @@ VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5 -@@ -2484,7 +2484,7 @@ READ_ONLY YES +@@ -2485,7 +2485,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME PERFORMANCE_SCHEMA_ACCOUNTS_SIZE VARIABLE_SCOPE GLOBAL @@ -782,7 +782,7 @@ VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2494,7 +2494,7 @@ READ_ONLY YES +@@ -2495,7 +2495,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_DIGESTS_SIZE VARIABLE_SCOPE GLOBAL @@ -791,7 +791,7 @@ VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 200 -@@ -2504,7 +2504,7 @@ READ_ONLY YES +@@ -2505,7 +2505,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -800,7 +800,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2514,7 +2514,7 @@ READ_ONLY YES +@@ -2515,7 +2515,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -809,7 +809,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2524,7 +2524,7 @@ READ_ONLY YES +@@ -2525,7 +2525,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -818,7 +818,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2534,7 +2534,7 @@ READ_ONLY YES +@@ -2535,7 +2535,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -827,7 +827,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2544,7 +2544,7 @@ READ_ONLY YES +@@ -2545,7 +2545,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE VARIABLE_SCOPE GLOBAL @@ -836,7 +836,7 @@ VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2554,7 +2554,7 @@ READ_ONLY YES +@@ -2555,7 +2555,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE VARIABLE_SCOPE GLOBAL @@ -845,7 +845,7 @@ VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1024 -@@ -2564,7 +2564,7 @@ READ_ONLY YES +@@ -2565,7 +2565,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_HOSTS_SIZE VARIABLE_SCOPE GLOBAL @@ -854,7 +854,7 @@ VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2574,7 +2574,7 @@ READ_ONLY YES +@@ -2575,7 +2575,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_CLASSES VARIABLE_SCOPE GLOBAL @@ -863,7 +863,7 @@ VARIABLE_COMMENT Maximum number of condition instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2584,7 +2584,7 @@ READ_ONLY YES +@@ -2585,7 +2585,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_COND_INSTANCES VARIABLE_SCOPE GLOBAL @@ -872,7 +872,7 @@ VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2594,7 +2594,7 @@ READ_ONLY YES +@@ -2595,7 +2595,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH VARIABLE_SCOPE GLOBAL @@ -881,7 +881,7 @@ VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2604,7 +2604,7 @@ READ_ONLY YES +@@ -2605,7 +2605,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_CLASSES VARIABLE_SCOPE GLOBAL @@ -890,7 +890,7 @@ VARIABLE_COMMENT Maximum number of file instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2614,7 +2614,7 @@ READ_ONLY YES +@@ -2615,7 +2615,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_HANDLES VARIABLE_SCOPE GLOBAL @@ -899,7 +899,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented files. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2624,7 +2624,7 @@ READ_ONLY YES +@@ -2625,7 +2625,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -908,7 +908,7 @@ VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2634,7 +2634,7 @@ READ_ONLY YES +@@ -2635,7 +2635,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES VARIABLE_SCOPE GLOBAL @@ -917,7 +917,7 @@ VARIABLE_COMMENT Maximum number of mutex instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2644,7 +2644,7 @@ READ_ONLY YES +@@ -2645,7 +2645,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES VARIABLE_SCOPE GLOBAL @@ -926,7 +926,7 @@ VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2654,7 +2654,7 @@ READ_ONLY YES +@@ -2655,7 +2655,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES VARIABLE_SCOPE GLOBAL @@ -935,7 +935,7 @@ VARIABLE_COMMENT Maximum number of rwlock instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2664,7 +2664,7 @@ READ_ONLY YES +@@ -2665,7 +2665,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES VARIABLE_SCOPE GLOBAL @@ -944,7 +944,7 @@ VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 104857600 -@@ -2674,7 +2674,7 @@ READ_ONLY YES +@@ -2675,7 +2675,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES VARIABLE_SCOPE GLOBAL @@ -953,7 +953,7 @@ VARIABLE_COMMENT Maximum number of socket instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2684,7 +2684,7 @@ READ_ONLY YES +@@ -2685,7 +2685,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES VARIABLE_SCOPE GLOBAL @@ -962,7 +962,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2694,7 +2694,7 @@ READ_ONLY YES +@@ -2695,7 +2695,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES VARIABLE_SCOPE GLOBAL @@ -971,7 +971,7 @@ VARIABLE_COMMENT Maximum number of stage instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2704,7 +2704,7 @@ READ_ONLY YES +@@ -2705,7 +2705,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES VARIABLE_SCOPE GLOBAL @@ -980,7 +980,7 @@ VARIABLE_COMMENT Maximum number of statement instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2714,7 +2714,7 @@ READ_ONLY YES +@@ -2715,7 +2715,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES VARIABLE_SCOPE GLOBAL @@ -989,7 +989,7 @@ VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2724,7 +2724,7 @@ READ_ONLY YES +@@ -2725,7 +2725,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES VARIABLE_SCOPE GLOBAL @@ -998,7 +998,7 @@ VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2734,7 +2734,7 @@ READ_ONLY YES +@@ -2735,7 +2735,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES VARIABLE_SCOPE GLOBAL @@ -1007,7 +1007,7 @@ VARIABLE_COMMENT Maximum number of thread instruments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 256 -@@ -2744,7 +2744,7 @@ READ_ONLY YES +@@ -2745,7 +2745,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES VARIABLE_SCOPE GLOBAL @@ -1016,7 +1016,7 @@ VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2754,7 +2754,7 @@ READ_ONLY YES +@@ -2755,7 +2755,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE VARIABLE_SCOPE GLOBAL @@ -1025,7 +1025,7 @@ VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2764,7 +2764,7 @@ READ_ONLY YES +@@ -2765,7 +2765,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE VARIABLE_SCOPE GLOBAL @@ -1034,7 +1034,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1024 -@@ -2774,7 +2774,7 @@ READ_ONLY YES +@@ -2775,7 +2775,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE VARIABLE_SCOPE GLOBAL @@ -1043,7 +1043,7 @@ VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1048576 -@@ -2784,7 +2784,7 @@ READ_ONLY YES +@@ -2785,7 +2785,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_USERS_SIZE VARIABLE_SCOPE GLOBAL @@ -1052,7 +1052,7 @@ VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. NUMERIC_MIN_VALUE -1 NUMERIC_MAX_VALUE 1048576 -@@ -2834,7 +2834,7 @@ READ_ONLY YES +@@ -2835,7 +2835,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PRELOAD_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1061,7 +1061,7 @@ VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -2854,7 +2854,7 @@ READ_ONLY NO +@@ -2855,7 +2855,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME PROFILING_HISTORY_SIZE VARIABLE_SCOPE SESSION @@ -1070,7 +1070,7 @@ VARIABLE_COMMENT Number of statements about which profiling information is maintained. If set to 0, no profiles are stored. See SHOW PROFILES. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 100 -@@ -2864,7 +2864,7 @@ READ_ONLY NO +@@ -2865,7 +2865,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PROGRESS_REPORT_TIME VARIABLE_SCOPE SESSION @@ -1079,7 +1079,7 @@ VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2924,7 +2924,7 @@ READ_ONLY NO +@@ -2925,7 +2925,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME QUERY_ALLOC_BLOCK_SIZE VARIABLE_SCOPE SESSION @@ -1088,7 +1088,7 @@ VARIABLE_COMMENT Allocation block size for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -2934,7 +2934,7 @@ READ_ONLY NO +@@ -2935,7 +2935,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_LIMIT VARIABLE_SCOPE GLOBAL @@ -1097,7 +1097,7 @@ VARIABLE_COMMENT Don't cache results that are bigger than this NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2944,7 +2944,7 @@ READ_ONLY NO +@@ -2945,7 +2945,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME QUERY_CACHE_MIN_RES_UNIT VARIABLE_SCOPE GLOBAL @@ -1106,7 +1106,7 @@ VARIABLE_COMMENT The minimum size for blocks allocated by the query cache NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2957,7 +2957,7 @@ VARIABLE_SCOPE GLOBAL +@@ -2958,7 +2958,7 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The memory allocated to store results from old queries NUMERIC_MIN_VALUE 0 @@ -1115,7 +1115,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2994,7 +2994,7 @@ READ_ONLY NO +@@ -2995,7 +2995,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME QUERY_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1124,7 +1124,7 @@ VARIABLE_COMMENT Persistent buffer for query parsing and execution NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 4294967295 -@@ -3007,7 +3007,7 @@ VARIABLE_SCOPE SESSION ONLY +@@ -3008,7 +3008,7 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1133,7 +1133,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3017,14 +3017,14 @@ VARIABLE_SCOPE SESSION ONLY +@@ -3018,14 +3018,14 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes NUMERIC_MIN_VALUE 0 @@ -1150,7 +1150,7 @@ VARIABLE_COMMENT Allocation block size for storing ranges during optimization NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 4294967295 -@@ -3037,14 +3037,14 @@ VARIABLE_SCOPE GLOBAL +@@ -3038,14 +3038,14 @@ VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum speed(KB/s) to read binlog from master (0 = no limit) NUMERIC_MIN_VALUE 0 @@ -1167,7 +1167,7 @@ VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value NUMERIC_MIN_VALUE 8192 NUMERIC_MAX_VALUE 2147483647 -@@ -3064,7 +3064,7 @@ READ_ONLY NO +@@ -3065,7 +3065,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME READ_RND_BUFFER_SIZE VARIABLE_SCOPE SESSION @@ -1176,7 +1176,7 @@ VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 2147483647 -@@ -3264,10 +3264,10 @@ READ_ONLY YES +@@ -3265,10 +3265,10 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ROWID_MERGE_BUFF_SIZE VARIABLE_SCOPE SESSION @@ -1189,7 +1189,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3284,20 +3284,20 @@ READ_ONLY NO +@@ -3285,20 +3285,20 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_MASTER_TIMEOUT VARIABLE_SCOPE GLOBAL @@ -1214,7 +1214,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3354,10 +3354,10 @@ READ_ONLY NO +@@ -3355,10 +3355,10 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME RPL_SEMI_SYNC_SLAVE_TRACE_LEVEL VARIABLE_SCOPE GLOBAL @@ -1227,7 +1227,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3394,7 +3394,7 @@ READ_ONLY YES +@@ -3395,7 +3395,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SERVER_ID VARIABLE_SCOPE SESSION @@ -1236,7 +1236,7 @@ VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -3524,7 +3524,7 @@ READ_ONLY NO +@@ -3525,7 +3525,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_DOMAIN_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1245,7 +1245,7 @@ VARIABLE_COMMENT Maximum number of parallel threads to use on slave for events in a single replication domain. When using multiple domains, this can be used to limit a single domain from grabbing all threads and thus stalling other domains. The default of 0 means to allow a domain to grab as many threads as it wants, up to the value of slave_parallel_threads. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3554,7 +3554,7 @@ READ_ONLY YES +@@ -3555,7 +3555,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_MAX_ALLOWED_PACKET VARIABLE_SCOPE GLOBAL @@ -1254,7 +1254,7 @@ VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 1073741824 -@@ -3574,7 +3574,7 @@ READ_ONLY NO +@@ -3575,7 +3575,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_MAX_QUEUED VARIABLE_SCOPE GLOBAL @@ -1263,7 +1263,7 @@ VARIABLE_COMMENT Limit on how much memory SQL threads should use per parallel replication thread when reading ahead in the relay log looking for opportunities for parallel replication. Only used when --slave-parallel-threads > 0. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 2147483647 -@@ -3594,7 +3594,7 @@ READ_ONLY NO +@@ -3595,7 +3595,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME SLAVE_PARALLEL_THREADS VARIABLE_SCOPE GLOBAL @@ -1272,7 +1272,7 @@ VARIABLE_COMMENT If non-zero, number of threads to spawn to apply in parallel events on the slave that were group-committed on the master or were logged with GTID in different replication domains. Note that these threads are in addition to the IO and SQL threads, which are always created by a replication slave NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3604,7 +3604,7 @@ READ_ONLY NO +@@ -3605,7 +3605,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_PARALLEL_WORKERS VARIABLE_SCOPE GLOBAL @@ -1281,7 +1281,7 @@ VARIABLE_COMMENT Alias for slave_parallel_threads NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16383 -@@ -3644,7 +3644,7 @@ READ_ONLY NO +@@ -3645,7 +3645,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SLAVE_TRANSACTION_RETRIES VARIABLE_SCOPE GLOBAL @@ -1290,7 +1290,7 @@ VARIABLE_COMMENT Number of times the slave SQL thread will retry a transaction in case it failed with a deadlock, elapsed lock wait timeout or listed in slave_transaction_retry_errors, before giving up and stopping NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -3664,7 +3664,7 @@ READ_ONLY YES +@@ -3665,7 +3665,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLAVE_TRANSACTION_RETRY_INTERVAL VARIABLE_SCOPE GLOBAL @@ -1299,7 +1299,7 @@ VARIABLE_COMMENT Interval of the slave SQL thread will retry a transaction in case it failed with a deadlock or elapsed lock wait timeout or listed in slave_transaction_retry_errors NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 3600 -@@ -3684,7 +3684,7 @@ READ_ONLY NO +@@ -3685,7 +3685,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME SLOW_LAUNCH_TIME VARIABLE_SCOPE GLOBAL @@ -1308,7 +1308,7 @@ VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 -@@ -3727,7 +3727,7 @@ VARIABLE_SCOPE SESSION +@@ -3728,7 +3728,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size NUMERIC_MIN_VALUE 1024 @@ -1317,7 +1317,7 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -3944,7 +3944,7 @@ READ_ONLY NO +@@ -3945,7 +3945,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME STORED_PROGRAM_CACHE VARIABLE_SCOPE GLOBAL @@ -1326,7 +1326,7 @@ VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 524288 -@@ -4044,7 +4044,7 @@ READ_ONLY NO +@@ -4045,7 +4045,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME TABLE_DEFINITION_CACHE VARIABLE_SCOPE GLOBAL @@ -1335,7 +1335,7 @@ VARIABLE_COMMENT The number of cached table definitions NUMERIC_MIN_VALUE 400 NUMERIC_MAX_VALUE 2097152 -@@ -4054,7 +4054,7 @@ READ_ONLY NO +@@ -4055,7 +4055,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TABLE_OPEN_CACHE VARIABLE_SCOPE GLOBAL @@ -1344,7 +1344,7 @@ VARIABLE_COMMENT The number of cached open tables NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 1048576 -@@ -4114,7 +4114,7 @@ READ_ONLY NO +@@ -4115,7 +4115,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE VARIABLE_SCOPE GLOBAL @@ -1353,7 +1353,7 @@ VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16384 -@@ -4124,7 +4124,7 @@ READ_ONLY NO +@@ -4125,7 +4125,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME THREAD_CONCURRENCY VARIABLE_SCOPE GLOBAL @@ -1362,7 +1362,7 @@ VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 512 -@@ -4287,7 +4287,7 @@ VARIABLE_SCOPE SESSION +@@ -4308,7 +4308,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max size for data for an internal temporary on-disk MyISAM or Aria table. NUMERIC_MIN_VALUE 1024 @@ -1371,19 +1371,19 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4297,7 +4297,7 @@ VARIABLE_SCOPE SESSION +@@ -4318,7 +4318,7 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. - NUMERIC_MIN_VALUE 1024 + NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -4307,14 +4307,14 @@ VARIABLE_SCOPE SESSION +@@ -4328,14 +4328,14 @@ VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. - NUMERIC_MIN_VALUE 1024 + NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 @@ -1397,7 +1397,7 @@ VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4324,7 +4324,7 @@ READ_ONLY NO +@@ -4345,7 +4345,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME TRANSACTION_PREALLOC_SIZE VARIABLE_SCOPE SESSION @@ -1406,7 +1406,7 @@ VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log NUMERIC_MIN_VALUE 1024 NUMERIC_MAX_VALUE 134217728 -@@ -4464,7 +4464,7 @@ READ_ONLY YES +@@ -4485,7 +4485,7 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME WAIT_TIMEOUT VARIABLE_SCOPE SESSION @@ -1415,7 +1415,7 @@ VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 31536000 -@@ -4491,7 +4491,7 @@ order by variable_name; +@@ -4512,7 +4512,7 @@ order by variable_name; VARIABLE_NAME LOG_TC_SIZE GLOBAL_VALUE_ORIGIN AUTO VARIABLE_SCOPE GLOBAL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 9931b78c45f..66b996b8cd3 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -4327,7 +4327,7 @@ VARIABLE_NAME TMP_MEMORY_TABLE_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. Same as tmp_table_size. -NUMERIC_MIN_VALUE 1024 +NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL @@ -4337,7 +4337,7 @@ VARIABLE_NAME TMP_TABLE_SIZE VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Alias for tmp_memory_table_size. If an internal in-memory temporary table exceeds this size, MariaDB will automatically convert it to an on-disk MyISAM or Aria table. -NUMERIC_MIN_VALUE 1024 +NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 18446744073709551615 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL diff --git a/mysql-test/suite/sys_vars/r/tmp_disk_table_size_func.result b/mysql-test/suite/sys_vars/r/tmp_disk_table_size_func.result index bc2301cfd39..7b26106384b 100644 --- a/mysql-test/suite/sys_vars/r/tmp_disk_table_size_func.result +++ b/mysql-test/suite/sys_vars/r/tmp_disk_table_size_func.result @@ -4,8 +4,6 @@ SET @start_tmp_memory_table_size=@@session.tmp_memory_table_size; SET @start_tmp_disk_table_size=@@session.tmp_disk_table_size; set @@session.tmp_memory_table_size=1000; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '1000' set @@session.tmp_disk_table_size=3000000; create table t1 (a int primary key, b varchar(2000)); insert into t1 select seq,repeat(char(mod(seq,62)+64),seq) from seq_1_to_2000; diff --git a/mysql-test/suite/sys_vars/r/tmp_memory_table_size_basic.result b/mysql-test/suite/sys_vars/r/tmp_memory_table_size_basic.result deleted file mode 100644 index dddba1a6dfe..00000000000 --- a/mysql-test/suite/sys_vars/r/tmp_memory_table_size_basic.result +++ /dev/null @@ -1,165 +0,0 @@ -SET @start_global_value = @@global.tmp_memory_table_size; -SET @start_session_value = @@session.tmp_memory_table_size; -'#--------------------FN_DYNVARS_005_01-------------------------#' -SET @@global.tmp_memory_table_size = 10000; -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -10000 -SET @@global.tmp_memory_table_size = DEFAULT; -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -16777216 -SET @@session.tmp_memory_table_size = 20000; -SELECT @@session.tmp_memory_table_size; -@@session.tmp_memory_table_size -20000 -SET @@session.tmp_memory_table_size = DEFAULT; -SELECT @@session.tmp_memory_table_size; -@@session.tmp_memory_table_size -16777216 -'#--------------------FN_DYNVARS_005_02-------------------------#' -SELECT @@global.tmp_memory_table_size >= 16777216; -@@global.tmp_memory_table_size >= 16777216 -1 -SELECT @@session.tmp_memory_table_size >= 16777216; -@@session.tmp_memory_table_size >= 16777216 -1 -'#--------------------FN_DYNVARS_005_03-------------------------#' -SET @@global.tmp_memory_table_size = 1024; -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -1024 -SET @@global.tmp_memory_table_size = 60020; -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -60020 -SET @@global.tmp_memory_table_size = 4294967295; -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -4294967295 -'#--------------------FN_DYNVARS_005_04-------------------------#' -SET @@session.tmp_memory_table_size = 1024; -SELECT @@session.tmp_memory_table_size; -@@session.tmp_memory_table_size -1024 -SET @@session.tmp_memory_table_size = 4294967295; -SELECT @@session.tmp_memory_table_size; -@@session.tmp_memory_table_size -4294967295 -SET @@session.tmp_memory_table_size = 65535; -SELECT @@session.tmp_memory_table_size; -@@session.tmp_memory_table_size -65535 -'#------------------FN_DYNVARS_005_05-----------------------#' -SET @@global.tmp_memory_table_size = 0; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '0' -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -1024 -SET @@global.tmp_memory_table_size = -1024; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '-1024' -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -1024 -SET @@global.tmp_memory_table_size = 1000; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '1000' -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -1024 -SET @@global.tmp_memory_table_size = ON; -ERROR 42000: Incorrect argument type to variable 'tmp_memory_table_size' -SET @@global.tmp_memory_table_size = OFF; -ERROR 42000: Incorrect argument type to variable 'tmp_memory_table_size' -SET @@global.tmp_memory_table_size = True; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '1' -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -1024 -SET @@global.tmp_memory_table_size = False; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '0' -SELECT @@global.tmp_memory_table_size; -@@global.tmp_memory_table_size -1024 -SET @@global.tmp_memory_table_size = 65530.34; -ERROR 42000: Incorrect argument type to variable 'tmp_memory_table_size' -SET @@global.tmp_memory_table_size ="Test"; -ERROR 42000: Incorrect argument type to variable 'tmp_memory_table_size' -SET @@session.tmp_memory_table_size = ON; -ERROR 42000: Incorrect argument type to variable 'tmp_memory_table_size' -SET @@session.tmp_memory_table_size = OFF; -ERROR 42000: Incorrect argument type to variable 'tmp_memory_table_size' -SET @@session.tmp_memory_table_size = True; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '1' -SELECT @@session.tmp_memory_table_size; -@@session.tmp_memory_table_size -1024 -SET @@session.tmp_memory_table_size = False; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '0' -SELECT @@session.tmp_memory_table_size; -@@session.tmp_memory_table_size -1024 -SET @@session.tmp_memory_table_size = "Test"; -ERROR 42000: Incorrect argument type to variable 'tmp_memory_table_size' -SET @@session.tmp_memory_table_size = 12345678901; -SELECT @@session.tmp_memory_table_size IN (12345678901,4294967295); -@@session.tmp_memory_table_size IN (12345678901,4294967295) -1 -'#------------------FN_DYNVARS_005_06-----------------------#' -SELECT @@global.tmp_memory_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tmp_memory_table_size'; -@@global.tmp_memory_table_size = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_005_07-----------------------#' -SELECT @@session.tmp_memory_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tmp_memory_table_size'; -@@session.tmp_memory_table_size = VARIABLE_VALUE -1 -'#---------------------FN_DYNVARS_001_09----------------------#' -SET @@global.tmp_memory_table_size = 1024; -SET @@tmp_memory_table_size = 4294967295; -SELECT @@tmp_memory_table_size = @@global.tmp_memory_table_size; -@@tmp_memory_table_size = @@global.tmp_memory_table_size -0 -'#---------------------FN_DYNVARS_001_10----------------------#' -SET @@tmp_memory_table_size = 100; -Warnings: -Warning 1292 Truncated incorrect tmp_memory_table_size value: '100' -SELECT @@tmp_memory_table_size = @@local.tmp_memory_table_size; -@@tmp_memory_table_size = @@local.tmp_memory_table_size -1 -SELECT @@local.tmp_memory_table_size = @@session.tmp_memory_table_size; -@@local.tmp_memory_table_size = @@session.tmp_memory_table_size -1 -'#---------------------FN_DYNVARS_001_11----------------------#' -SET tmp_memory_table_size = 1027; -SELECT @@tmp_memory_table_size; -@@tmp_memory_table_size -1027 -SELECT local.tmp_memory_table_size; -ERROR 42S02: Unknown table 'local' in field list -SELECT global.tmp_memory_table_size; -ERROR 42S02: Unknown table 'global' in field list -SELECT tmp_memory_table_size = @@session.tmp_memory_table_size; -ERROR 42S22: Unknown column 'tmp_memory_table_size' in 'field list' - -"Check that tmp_memory_table_size and tmp_table_size are the same" - -set @@session.tmp_memory_table_size=100000; -select @@session.tmp_memory_table_size,@@session.tmp_table_size; -@@session.tmp_memory_table_size @@session.tmp_table_size -100000 100000 -set @@session.tmp_memory_table_size=200000; -select @@session.tmp_memory_table_size,@@session.tmp_table_size; -@@session.tmp_memory_table_size @@session.tmp_table_size -200000 200000 -SET @@global.tmp_memory_table_size = @start_global_value; -SET @@session.tmp_memory_table_size = @start_session_value; 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 deleted file mode 100644 index 06b624ad5c8..00000000000 --- a/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result +++ /dev/null @@ -1,146 +0,0 @@ -SET @start_global_value = @@global.tmp_table_size; -SET @start_session_value = @@session.tmp_table_size; -'#--------------------FN_DYNVARS_005_01-------------------------#' -SET @@global.tmp_table_size = 100; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '100' -SET @@global.tmp_table_size = DEFAULT; -SET @@session.tmp_table_size = 200; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '200' -SET @@session.tmp_table_size = DEFAULT; -'#--------------------FN_DYNVARS_005_02-------------------------#' -SELECT @@global.tmp_table_size >= 16777216; -@@global.tmp_table_size >= 16777216 -1 -SELECT @@session.tmp_table_size >= 16777216; -@@session.tmp_table_size >= 16777216 -1 -'#--------------------FN_DYNVARS_005_03-------------------------#' -SET @@global.tmp_table_size = 1024; -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -1024 -SET @@global.tmp_table_size = 60020; -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -60020 -SET @@global.tmp_table_size = 4294967295; -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -4294967295 -'#--------------------FN_DYNVARS_005_04-------------------------#' -SET @@session.tmp_table_size = 1024; -SELECT @@session.tmp_table_size; -@@session.tmp_table_size -1024 -SET @@session.tmp_table_size = 4294967295; -SELECT @@session.tmp_table_size; -@@session.tmp_table_size -4294967295 -SET @@session.tmp_table_size = 65535; -SELECT @@session.tmp_table_size; -@@session.tmp_table_size -65535 -'#------------------FN_DYNVARS_005_05-----------------------#' -SET @@global.tmp_table_size = 0; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '0' -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -1024 -SET @@global.tmp_table_size = -1024; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '-1024' -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -1024 -SET @@global.tmp_table_size = 1000; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '1000' -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -1024 -SET @@global.tmp_table_size = ON; -ERROR 42000: Incorrect argument type to variable 'tmp_table_size' -SET @@global.tmp_table_size = OFF; -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' -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -1024 -SET @@global.tmp_table_size = False; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '0' -SELECT @@global.tmp_table_size; -@@global.tmp_table_size -1024 -SET @@global.tmp_table_size = 65530.34; -ERROR 42000: Incorrect argument type to variable 'tmp_table_size' -SET @@global.tmp_table_size ="Test"; -ERROR 42000: Incorrect argument type to variable 'tmp_table_size' -SET @@session.tmp_table_size = ON; -ERROR 42000: Incorrect argument type to variable 'tmp_table_size' -SET @@session.tmp_table_size = OFF; -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' -SELECT @@session.tmp_table_size; -@@session.tmp_table_size -1024 -SET @@session.tmp_table_size = False; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '0' -SELECT @@session.tmp_table_size; -@@session.tmp_table_size -1024 -SET @@session.tmp_table_size = "Test"; -ERROR 42000: Incorrect argument type to variable 'tmp_table_size' -SET @@session.tmp_table_size = 12345678901; -SELECT @@session.tmp_table_size IN (12345678901,4294967295); -@@session.tmp_table_size IN (12345678901,4294967295) -1 -'#------------------FN_DYNVARS_005_06-----------------------#' -SELECT @@global.tmp_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tmp_table_size'; -@@global.tmp_table_size = VARIABLE_VALUE -1 -'#------------------FN_DYNVARS_005_07-----------------------#' -SELECT @@session.tmp_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tmp_table_size'; -@@session.tmp_table_size = VARIABLE_VALUE -1 -'#---------------------FN_DYNVARS_001_09----------------------#' -SET @@global.tmp_table_size = 1024; -SET @@tmp_table_size = 4294967295; -SELECT @@tmp_table_size = @@global.tmp_table_size; -@@tmp_table_size = @@global.tmp_table_size -0 -'#---------------------FN_DYNVARS_001_10----------------------#' -SET @@tmp_table_size = 100; -Warnings: -Warning 1292 Truncated incorrect tmp_table_size value: '100' -SELECT @@tmp_table_size = @@local.tmp_table_size; -@@tmp_table_size = @@local.tmp_table_size -1 -SELECT @@local.tmp_table_size = @@session.tmp_table_size; -@@local.tmp_table_size = @@session.tmp_table_size -1 -'#---------------------FN_DYNVARS_001_11----------------------#' -SET tmp_table_size = 1027; -SELECT @@tmp_table_size; -@@tmp_table_size -1027 -SELECT local.tmp_table_size; -ERROR 42S02: Unknown table 'local' in field list -SELECT global.tmp_table_size; -ERROR 42S02: Unknown table 'global' in field list -SELECT tmp_table_size = @@session.tmp_table_size; -ERROR 42S22: Unknown column 'tmp_table_size' in 'field list' -SET @@global.tmp_table_size = @start_global_value; -SET @@session.tmp_table_size = @start_session_value; diff --git a/mysql-test/suite/sys_vars/t/tmp_memory_table_size_basic.test b/mysql-test/suite/sys_vars/t/tmp_memory_table_size_basic.test deleted file mode 100644 index f5fcb17c8a5..00000000000 --- a/mysql-test/suite/sys_vars/t/tmp_memory_table_size_basic.test +++ /dev/null @@ -1,209 +0,0 @@ -###################### tmp_memory_table_size_basic.test ###################### -# # -# Variable Name: tmp_memory_table_size # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: numeric # -# # -# Description: Test Cases of Dynamic System Variable tmp_table_size # -# that checks the behavior of this variable in the following ways# -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -############################################################################### - ---source include/load_sysvars.inc - -############################################################## -# START OF tmp_memory_table_size TESTS # -############################################################## - -############################################################# -# Save initial value # -############################################################# - -SET @start_global_value = @@global.tmp_memory_table_size; -SET @start_session_value = @@session.tmp_memory_table_size; - ---echo '#--------------------FN_DYNVARS_005_01-------------------------#' -############################################################## -# Display the DEFAULT value of tmp_memory_table_size # -############################################################## - -SET @@global.tmp_memory_table_size = 10000; -SELECT @@global.tmp_memory_table_size; -SET @@global.tmp_memory_table_size = DEFAULT; -SELECT @@global.tmp_memory_table_size; - -SET @@session.tmp_memory_table_size = 20000; -SELECT @@session.tmp_memory_table_size; -SET @@session.tmp_memory_table_size = DEFAULT; -SELECT @@session.tmp_memory_table_size; - ---echo '#--------------------FN_DYNVARS_005_02-------------------------#' -######################################################################## -# Check the DEFAULT value of tmp_memory_table_size # -######################################################################## -# The DEFAULT value is system dependend. -# Therefore we have only a plausibility check here -SELECT @@global.tmp_memory_table_size >= 16777216; -SELECT @@session.tmp_memory_table_size >= 16777216; - ---echo '#--------------------FN_DYNVARS_005_03-------------------------#' -######################################################################## -# Change the value of tmp_memory_table_size to a valid value for GLOBAL Scope # -######################################################################## - -SET @@global.tmp_memory_table_size = 1024; -SELECT @@global.tmp_memory_table_size; -SET @@global.tmp_memory_table_size = 60020; -SELECT @@global.tmp_memory_table_size; -SET @@global.tmp_memory_table_size = 4294967295; -SELECT @@global.tmp_memory_table_size; - - ---echo '#--------------------FN_DYNVARS_005_04-------------------------#' -######################################################################### -# Change the value of tmp_memory_table_size to a valid value for SESSION Scope # -######################################################################### - -SET @@session.tmp_memory_table_size = 1024; -SELECT @@session.tmp_memory_table_size; - -SET @@session.tmp_memory_table_size = 4294967295; -SELECT @@session.tmp_memory_table_size; -SET @@session.tmp_memory_table_size = 65535; -SELECT @@session.tmp_memory_table_size; - - ---echo '#------------------FN_DYNVARS_005_05-----------------------#' -########################################################## -# Change the value of tmp_memory_table_size to an invalid value # -########################################################## - -SET @@global.tmp_memory_table_size = 0; -SELECT @@global.tmp_memory_table_size; - -SET @@global.tmp_memory_table_size = -1024; -SELECT @@global.tmp_memory_table_size; - -SET @@global.tmp_memory_table_size = 1000; -SELECT @@global.tmp_memory_table_size; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_memory_table_size = ON; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_memory_table_size = OFF; - -SET @@global.tmp_memory_table_size = True; -SELECT @@global.tmp_memory_table_size; - -SET @@global.tmp_memory_table_size = False; -SELECT @@global.tmp_memory_table_size; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_memory_table_size = 65530.34; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_memory_table_size ="Test"; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.tmp_memory_table_size = ON; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.tmp_memory_table_size = OFF; - -SET @@session.tmp_memory_table_size = True; -SELECT @@session.tmp_memory_table_size; - -SET @@session.tmp_memory_table_size = False; -SELECT @@session.tmp_memory_table_size; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.tmp_memory_table_size = "Test"; - ---disable_warnings -SET @@session.tmp_memory_table_size = 12345678901; ---enable_warnings -# With a 64 bit mysqld:12345678901,with a 32 bit mysqld: 4294967295 -SELECT @@session.tmp_memory_table_size IN (12345678901,4294967295); - ---echo '#------------------FN_DYNVARS_005_06-----------------------#' -#################################################################### -# Check if the value in GLOBAL Table matches value in variable # -#################################################################### - -SELECT @@global.tmp_memory_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tmp_memory_table_size'; - ---echo '#------------------FN_DYNVARS_005_07-----------------------#' -#################################################################### -# Check if the value in SESSION Table matches value in variable # -#################################################################### - -SELECT @@session.tmp_memory_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tmp_memory_table_size'; - ---echo '#---------------------FN_DYNVARS_001_09----------------------#' -######################################################################## -# Check if global and session variables are independent of each other # -######################################################################## - -SET @@global.tmp_memory_table_size = 1024; -SET @@tmp_memory_table_size = 4294967295; -SELECT @@tmp_memory_table_size = @@global.tmp_memory_table_size; - ---echo '#---------------------FN_DYNVARS_001_10----------------------#' -################################################################## -# Check if accessing variable with SESSION,LOCAL and without # -# SCOPE points to same session variable # -################################################################## - -SET @@tmp_memory_table_size = 100; -SELECT @@tmp_memory_table_size = @@local.tmp_memory_table_size; -SELECT @@local.tmp_memory_table_size = @@session.tmp_memory_table_size; - - ---echo '#---------------------FN_DYNVARS_001_11----------------------#' -######################################################################### -# Check if tmp_memory_table_size can be accessed with and without @@ sign # -######################################################################### - -SET tmp_memory_table_size = 1027; -SELECT @@tmp_memory_table_size; - ---Error ER_UNKNOWN_TABLE -SELECT local.tmp_memory_table_size; - ---Error ER_UNKNOWN_TABLE -SELECT global.tmp_memory_table_size; - ---Error ER_BAD_FIELD_ERROR -SELECT tmp_memory_table_size = @@session.tmp_memory_table_size; - ---echo ---echo "Check that tmp_memory_table_size and tmp_table_size are the same" ---echo - -set @@session.tmp_memory_table_size=100000; -select @@session.tmp_memory_table_size,@@session.tmp_table_size; -set @@session.tmp_memory_table_size=200000; -select @@session.tmp_memory_table_size,@@session.tmp_table_size; - - -#################################### -# Restore initial value # -#################################### - -SET @@global.tmp_memory_table_size = @start_global_value; -SET @@session.tmp_memory_table_size = @start_session_value; - -################################################### -# END OF tmp_memory_table_size TESTS # -################################################### - diff --git a/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test b/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test deleted file mode 100644 index 116196ddb07..00000000000 --- a/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test +++ /dev/null @@ -1,207 +0,0 @@ -########################### tmp_table_size_basic.test ########################## -# # -# Variable Name: tmp_table_size # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: numeric # -# Default Value: system dependend # -# Range: 1024-system dependend # -# # -# # -# Creation Date: 2008-02-13 # -# Author: Salman # -# # -# Description: Test Cases of Dynamic System Variable tmp_table_size # -# that checks the behavior of this variable in the following ways # -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# Modified: 2008-12-04 HHunger # -# removed the differences between 64 and 32 bit platforms # -# # -# Reference: # -# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html # -# # -################################################################################ - ---source include/load_sysvars.inc - -############################################################## -# START OF tmp_table_size TESTS # -############################################################## - -############################################################# -# Save initial value # -############################################################# - -SET @start_global_value = @@global.tmp_table_size; -SET @start_session_value = @@session.tmp_table_size; - ---echo '#--------------------FN_DYNVARS_005_01-------------------------#' -############################################################## -# Display the DEFAULT value of tmp_table_size # -############################################################## - -SET @@global.tmp_table_size = 100; -SET @@global.tmp_table_size = DEFAULT; - -SET @@session.tmp_table_size = 200; -SET @@session.tmp_table_size = DEFAULT; - ---echo '#--------------------FN_DYNVARS_005_02-------------------------#' -######################################################################## -# Check the DEFAULT value of tmp_table_size # -######################################################################## -# The DEFAULT value is system dependend. -# Therefore we have only a plausibility check here -SELECT @@global.tmp_table_size >= 16777216; - -SELECT @@session.tmp_table_size >= 16777216; - ---echo '#--------------------FN_DYNVARS_005_03-------------------------#' -######################################################################## -# Change the value of tmp_table_size to a valid value for GLOBAL Scope # -######################################################################## - -SET @@global.tmp_table_size = 1024; -SELECT @@global.tmp_table_size; -SET @@global.tmp_table_size = 60020; -SELECT @@global.tmp_table_size; -SET @@global.tmp_table_size = 4294967295; -SELECT @@global.tmp_table_size; - - ---echo '#--------------------FN_DYNVARS_005_04-------------------------#' -######################################################################### -# Change the value of tmp_table_size to a valid value for SESSION Scope # -######################################################################### - -SET @@session.tmp_table_size = 1024; -SELECT @@session.tmp_table_size; - -SET @@session.tmp_table_size = 4294967295; -SELECT @@session.tmp_table_size; -SET @@session.tmp_table_size = 65535; -SELECT @@session.tmp_table_size; - - ---echo '#------------------FN_DYNVARS_005_05-----------------------#' -########################################################## -# Change the value of tmp_table_size to an invalid value # -########################################################## - -SET @@global.tmp_table_size = 0; -SELECT @@global.tmp_table_size; - -SET @@global.tmp_table_size = -1024; -SELECT @@global.tmp_table_size; - -SET @@global.tmp_table_size = 1000; -SELECT @@global.tmp_table_size; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_table_size = ON; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_table_size = OFF; - -SET @@global.tmp_table_size = True; -SELECT @@global.tmp_table_size; - -SET @@global.tmp_table_size = False; -SELECT @@global.tmp_table_size; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_table_size = 65530.34; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@global.tmp_table_size ="Test"; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.tmp_table_size = ON; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.tmp_table_size = OFF; - -SET @@session.tmp_table_size = True; -SELECT @@session.tmp_table_size; - -SET @@session.tmp_table_size = False; -SELECT @@session.tmp_table_size; - ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.tmp_table_size = "Test"; - ---disable_warnings -SET @@session.tmp_table_size = 12345678901; ---enable_warnings -# With a 64 bit mysqld:12345678901,with a 32 bit mysqld: 4294967295 -SELECT @@session.tmp_table_size IN (12345678901,4294967295); - ---echo '#------------------FN_DYNVARS_005_06-----------------------#' -#################################################################### -# Check if the value in GLOBAL Table matches value in variable # -#################################################################### - -SELECT @@global.tmp_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='tmp_table_size'; - ---echo '#------------------FN_DYNVARS_005_07-----------------------#' -#################################################################### -# Check if the value in SESSION Table matches value in variable # -#################################################################### - -SELECT @@session.tmp_table_size = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='tmp_table_size'; - ---echo '#---------------------FN_DYNVARS_001_09----------------------#' -######################################################################## -# Check if global and session variables are independent of each other # -######################################################################## - -SET @@global.tmp_table_size = 1024; -SET @@tmp_table_size = 4294967295; -SELECT @@tmp_table_size = @@global.tmp_table_size; - ---echo '#---------------------FN_DYNVARS_001_10----------------------#' -################################################################## -# Check if accessing variable with SESSION,LOCAL and without # -# SCOPE points to same session variable # -################################################################## - -SET @@tmp_table_size = 100; -SELECT @@tmp_table_size = @@local.tmp_table_size; -SELECT @@local.tmp_table_size = @@session.tmp_table_size; - - ---echo '#---------------------FN_DYNVARS_001_11----------------------#' -######################################################################### -# Check if tmp_table_size can be accessed with and without @@ sign # -######################################################################### - -SET tmp_table_size = 1027; -SELECT @@tmp_table_size; - ---Error ER_UNKNOWN_TABLE -SELECT local.tmp_table_size; - ---Error ER_UNKNOWN_TABLE -SELECT global.tmp_table_size; - ---Error ER_BAD_FIELD_ERROR -SELECT tmp_table_size = @@session.tmp_table_size; - -#################################### -# Restore initial value # -#################################### - -SET @@global.tmp_table_size = @start_global_value; -SET @@session.tmp_table_size = @start_session_value; - -################################################### -# END OF tmp_table_size TESTS # -################################################### - diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 5ff31898a0d..c4a50470690 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -42,8 +42,9 @@ size_t Item_sum::ram_limitation(THD *thd) { - return (size_t)MY_MIN(thd->variables.tmp_memory_table_size, - thd->variables.max_heap_table_size); + return MY_MAX(1024, + (size_t)MY_MIN(thd->variables.tmp_memory_table_size, + thd->variables.max_heap_table_size)); } diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 80f3b242e59..44cb524d1b8 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -4522,7 +4522,7 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd) } uint reclength= field->pack_length(); - if (using_unique_constraint) + if (using_unique_constraint || thd->variables.tmp_memory_table_size == 0) { share->db_plugin= ha_lock_engine(0, TMP_ENGINE_HTON); table->file= get_new_handler(share, &table->mem_root, diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 4e20ec40bf7..ff92b042ccc 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3869,7 +3869,7 @@ static Sys_var_ulonglong Sys_tmp_table_size( "If an internal in-memory temporary table exceeds this size, MariaDB " "will automatically convert it to an on-disk MyISAM or Aria table.", SESSION_VAR(tmp_memory_table_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, (ulonglong)~(intptr)0), DEFAULT(16*1024*1024), + VALID_RANGE(0, (ulonglong)~(intptr)0), DEFAULT(16*1024*1024), BLOCK_SIZE(1)); static Sys_var_ulonglong Sys_tmp_memory_table_size( @@ -3878,7 +3878,7 @@ static Sys_var_ulonglong Sys_tmp_memory_table_size( "will automatically convert it to an on-disk MyISAM or Aria table. " "Same as tmp_table_size.", SESSION_VAR(tmp_memory_table_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, (ulonglong)~(intptr)0), DEFAULT(16*1024*1024), + VALID_RANGE(0, (ulonglong)~(intptr)0), DEFAULT(16*1024*1024), BLOCK_SIZE(1)); static Sys_var_ulonglong Sys_tmp_disk_table_size( @@ -4161,7 +4161,9 @@ static Sys_var_mybool Sys_big_tables( "big_tables", "Old variable, which if set to 1, allows large result sets " "by saving all temporary sets to disk, avoiding 'table full' errors. No " "longer needed, as the server now handles this automatically.", - SESSION_VAR(big_tables), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); + SESSION_VAR(big_tables), CMD_LINE(OPT_ARG), DEFAULT(FALSE), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0), + DEPRECATED("")); static Sys_var_bit Sys_big_selects( "sql_big_selects", "If set to 0, MariaDB will not perform large SELECTs." |