diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
| commit | 45e6d0aebf023acb50671f82b87e6de5d1e78f5e (patch) | |
| tree | c6079a18e158706a0a877d1b522ceb851d6055b5 /mysql-test/t/variables.test | |
| parent | f5cb66fb97101bc0f17ff879025fd7146c032cbc (diff) | |
| parent | 2e91eb7547dfc7c9a999568bd8245832bbcfefaa (diff) | |
| download | mariadb-git-45e6d0aebf023acb50671f82b87e6de5d1e78f5e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index ed6e92f145e..fc8dc89373b 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/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, |