diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
| commit | 65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch) | |
| tree | 7fe642e7d6e685ed87fbd292d986b871b5e0a720 /mysql-test/main/variables.test | |
| parent | 9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff) | |
| parent | 36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff) | |
| download | mariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz | |
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/variables.test')
| -rw-r--r-- | mysql-test/main/variables.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/variables.test b/mysql-test/main/variables.test index 4da3cac3a73..fa0bdc251b5 100644 --- a/mysql-test/main/variables.test +++ b/mysql-test/main/variables.test @@ -343,6 +343,7 @@ set sql_select_limit=1; # reset it, so later tests don't get confused 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; @@ -502,7 +503,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'MYI SET GLOBAL table_open_cache=-1; SHOW VARIABLES LIKE 'table_open_cache'; SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'table_open_cache'; -SET GLOBAL table_open_cache=DEFAULT; +SET GLOBAL table_open_cache=@save_table_open_cache; # # Bugs12363: character_set_results is nullable, |