summaryrefslogtreecommitdiff
path: root/mysql-test/main/variables.result
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 12:41:19 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 12:41:19 +0300
commit65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch)
tree7fe642e7d6e685ed87fbd292d986b871b5e0a720 /mysql-test/main/variables.result
parent9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff)
parent36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff)
downloadmariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/variables.result')
-rw-r--r--mysql-test/main/variables.result7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/main/variables.result b/mysql-test/main/variables.result
index 89b2367cec8..9224aa82e8a 100644
--- a/mysql-test/main/variables.result
+++ b/mysql-test/main/variables.result
@@ -568,6 +568,7 @@ set sql_safe_updates=1;
set sql_select_limit=1;
set sql_select_limit=default;
set sql_warnings=1;
+set @save_table_open_cache=@@table_open_cache;
set global table_open_cache=100;
set default_storage_engine=myisam;
set global thread_cache_size=100;
@@ -748,11 +749,11 @@ Warnings:
Warning 1292 Truncated incorrect table_open_cache value: '-1'
SHOW VARIABLES LIKE 'table_open_cache';
Variable_name Value
-table_open_cache 1
+table_open_cache 10
SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'table_open_cache';
VARIABLE_NAME VARIABLE_VALUE
-TABLE_OPEN_CACHE 1
-SET GLOBAL table_open_cache=DEFAULT;
+TABLE_OPEN_CACHE 10
+SET GLOBAL table_open_cache=@save_table_open_cache;
set character_set_results=NULL;
select ifnull(@@character_set_results,"really null");
ifnull(@@character_set_results,"really null")