Commit 80baf58e authored by Mikael Ronstrom's avatar Mikael Ronstrom

Scaled back to number of open cached tables to 400 in open_cache as well as definition_cache

Also fixed test cases related to this
parent a6a94f83
SET @start_value = @@global.table_definition_cache; SET @start_value = @@global.table_definition_cache;
SELECT @start_value; SELECT @start_value;
@start_value @start_value
256 400
'#--------------------FN_DYNVARS_019_01------------------------#' '#--------------------FN_DYNVARS_019_01------------------------#'
SET @@global.table_definition_cache = 100; SET @@global.table_definition_cache = 100;
Warnings: Warnings:
...@@ -9,12 +9,12 @@ Warning 1292 Truncated incorrect table_definition_cache value: '100' ...@@ -9,12 +9,12 @@ Warning 1292 Truncated incorrect table_definition_cache value: '100'
SET @@global.table_definition_cache = DEFAULT; SET @@global.table_definition_cache = DEFAULT;
SELECT @@global.table_definition_cache; SELECT @@global.table_definition_cache;
@@global.table_definition_cache @@global.table_definition_cache
256 400
'#---------------------FN_DYNVARS_019_02-------------------------#' '#---------------------FN_DYNVARS_019_02-------------------------#'
SET @@global.table_definition_cache = DEFAULT; SET @@global.table_definition_cache = DEFAULT;
SELECT @@global.table_definition_cache = 128; SELECT @@global.table_definition_cache = 400;
@@global.table_definition_cache = 128 @@global.table_definition_cache = 400
0 1
'#--------------------FN_DYNVARS_019_03------------------------#' '#--------------------FN_DYNVARS_019_03------------------------#'
SET @@global.table_definition_cache = 1; SET @@global.table_definition_cache = 1;
Warnings: Warnings:
...@@ -109,4 +109,4 @@ ERROR 42S22: Unknown column 'table_definition_cache' in 'field list' ...@@ -109,4 +109,4 @@ ERROR 42S22: Unknown column 'table_definition_cache' in 'field list'
SET @@global.table_definition_cache = @start_value; SET @@global.table_definition_cache = @start_value;
SELECT @@global.table_definition_cache; SELECT @@global.table_definition_cache;
@@global.table_definition_cache @@global.table_definition_cache
256 400
SET @start_value = @@global.table_open_cache ; SET @start_value = @@global.table_open_cache ;
SELECT @start_value; SELECT @start_value;
@start_value @start_value
64 400
'#--------------------FN_DYNVARS_001_01------------------------#' '#--------------------FN_DYNVARS_001_01------------------------#'
SET @@global.table_open_cache = 99; SET @@global.table_open_cache = 99;
SET @@global.table_open_cache = DeFAULT; SET @@global.table_open_cache = DeFAULT;
SELECT @@global.table_open_cache; SELECT @@global.table_open_cache;
@@global.table_open_cache @@global.table_open_cache
64 400
'#---------------------FN_DYNVARS_001_02-------------------------#' '#---------------------FN_DYNVARS_001_02-------------------------#'
SET @@global.table_open_cache = Default; SET @@global.table_open_cache = Default;
SELECT @@global.table_open_cache = 64; SELECT @@global.table_open_cache = 400;
@@global.table_open_cache = 64 @@global.table_open_cache = 400
1 1
'#--------------------FN_DYNVARS_001_03------------------------#' '#--------------------FN_DYNVARS_001_03------------------------#'
SET @@global.table_open_cache = 8; SET @@global.table_open_cache = 8;
...@@ -105,4 +105,4 @@ ERROR 42S22: Unknown column 'table_open_cache' in 'field list' ...@@ -105,4 +105,4 @@ ERROR 42S22: Unknown column 'table_open_cache' in 'field list'
SET @@global.table_open_cache = @start_value; SET @@global.table_open_cache = @start_value;
SELECT @@global.table_open_cache ; SELECT @@global.table_open_cache ;
@@global.table_open_cache @@global.table_open_cache
64 400
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Scope: GLOBAL # # Scope: GLOBAL #
# Access Type: Dynamic # # Access Type: Dynamic #
# Data Type: Numeric # # Data Type: Numeric #
# Default Value: 128 # # Default Value: 400 #
# Range: 1 - 524288 # # Range: 1 - 524288 #
# # # #
# # # #
...@@ -52,7 +52,7 @@ SELECT @@global.table_definition_cache; ...@@ -52,7 +52,7 @@ SELECT @@global.table_definition_cache;
############################################### ###############################################
SET @@global.table_definition_cache = DEFAULT; SET @@global.table_definition_cache = DEFAULT;
SELECT @@global.table_definition_cache = 128; SELECT @@global.table_definition_cache = 400;
--echo '#--------------------FN_DYNVARS_019_03------------------------#' --echo '#--------------------FN_DYNVARS_019_03------------------------#'
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# Scope: GLOBAL # # Scope: GLOBAL #
# Access Type: Dynamic # # Access Type: Dynamic #
# Data Type: numeric # # Data Type: numeric #
# Default Value: 64 # # Default Value: 400 #
# Range: 1-524288 # # Range: 64-524288 #
# # # #
# # # #
# Creation Date: 2008-02-13 # # Creation Date: 2008-02-13 #
...@@ -54,7 +54,7 @@ SELECT @@global.table_open_cache; ...@@ -54,7 +54,7 @@ SELECT @@global.table_open_cache;
############################################### ###############################################
SET @@global.table_open_cache = Default; SET @@global.table_open_cache = Default;
SELECT @@global.table_open_cache = 64; SELECT @@global.table_open_cache = 400;
--echo '#--------------------FN_DYNVARS_001_03------------------------#' --echo '#--------------------FN_DYNVARS_001_03------------------------#'
######################################################################## ########################################################################
......
...@@ -260,8 +260,8 @@ class Default_object_creation_ctx : public Object_creation_ctx ...@@ -260,8 +260,8 @@ class Default_object_creation_ctx : public Object_creation_ctx
#define MAX_FIELDS_BEFORE_HASH 32 #define MAX_FIELDS_BEFORE_HASH 32
#define USER_VARS_HASH_SIZE 16 #define USER_VARS_HASH_SIZE 16
#define TABLE_OPEN_CACHE_MIN 64 #define TABLE_OPEN_CACHE_MIN 64
#define TABLE_OPEN_CACHE_DEFAULT 1024 #define TABLE_OPEN_CACHE_DEFAULT 400
#define TABLE_DEF_CACHE_DEFAULT 1024 #define TABLE_DEF_CACHE_DEFAULT 400
/** /**
We must have room for at least 256 table definitions in the table We must have room for at least 256 table definitions in the table
cache, since otherwise there is no chance prepared cache, since otherwise there is no chance prepared
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment