Skip to content

Commit 2996f9a

Browse files
committed
MDEV-11429 Increase number of max table_open_cache instances
Increase max number of possible table_open_cache instances from 512K to 1024K. This only affects user who are trying to set the variable over the old limit. Delete not used test table_open_cache_instances_basic (Need to be added back and rewritten in 10.2)
1 parent 2fd3af4 commit 2996f9a

File tree

6 files changed

+4
-9
lines changed

6 files changed

+4
-9
lines changed

mysql-test/suite/sys_vars/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111
##############################################################################
1212

1313
innodb_flush_checkpoint_debug_basic: removed from XtraDB-26.0
14-
table_open_cache_instances_basic: no such variable in MariaDB
1514
all_vars: obsolete, see sysvars_* tests

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4540,7 +4540,7 @@ VARIABLE_SCOPE GLOBAL
45404540
VARIABLE_TYPE BIGINT UNSIGNED
45414541
VARIABLE_COMMENT The number of cached open tables
45424542
NUMERIC_MIN_VALUE 1
4543-
NUMERIC_MAX_VALUE 524288
4543+
NUMERIC_MAX_VALUE 1048576
45444544
NUMERIC_BLOCK_SIZE 1
45454545
ENUM_VALUE_LIST NULL
45464546
READ_ONLY NO

mysql-test/suite/sys_vars/r/table_open_cache_basic.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Warnings:
2727
Warning 1292 Truncated incorrect table_open_cache value: '1073741824'
2828
SELECT @@global.table_open_cache ;
2929
@@global.table_open_cache
30-
524288
30+
1048576
3131
SET @@global.table_open_cache = 18000;
3232
SELECT @@global.table_open_cache ;
3333
@@global.table_open_cache
@@ -48,7 +48,7 @@ Warnings:
4848
Warning 1292 Truncated incorrect table_open_cache value: '100000000000'
4949
SELECT @@global.table_open_cache ;
5050
@@global.table_open_cache
51-
524288
51+
1048576
5252
SET @@global.table_open_cache = -1024;
5353
Warnings:
5454
Warning 1292 Truncated incorrect table_open_cache value: '-1024'

mysql-test/suite/sys_vars/r/table_open_cache_instances_basic.result

Lines changed: 0 additions & 3 deletions
This file was deleted.

mysql-test/suite/sys_vars/t/table_open_cache_instances_basic.test

Lines changed: 0 additions & 1 deletion
This file was deleted.

sql/sys_vars.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3219,7 +3219,7 @@ static bool fix_table_open_cache(sys_var *, THD *, enum_var_type)
32193219
static Sys_var_ulong Sys_table_cache_size(
32203220
"table_open_cache", "The number of cached open tables",
32213221
GLOBAL_VAR(tc_size), CMD_LINE(REQUIRED_ARG),
3222-
VALID_RANGE(1, 512*1024), DEFAULT(TABLE_OPEN_CACHE_DEFAULT),
3222+
VALID_RANGE(1, 1024*1024), DEFAULT(TABLE_OPEN_CACHE_DEFAULT),
32233223
BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
32243224
ON_UPDATE(fix_table_open_cache));
32253225

0 commit comments

Comments
 (0)