diff options
| author | monty@mysql.com <> | 2005-11-23 22:58:53 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-11-23 22:58:53 +0200 |
| commit | 4575a662cb99b63ec4c790ed00ac6ec09deb7cc3 (patch) | |
| tree | 8972ae3c8dffff8f3b6f27565d191af346c9ac8d /mysql-test/r/variables.result | |
| parent | 30b360bfccdf9471efb444df0514693f0fb94444 (diff) | |
| parent | e42c98096746bc675e0c6d6b45776937d7cfb05b (diff) | |
| download | mariadb-git-4575a662cb99b63ec4c790ed00ac6ec09deb7cc3.tar.gz | |
Merge mysql.com:/home/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1-TDC
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index df180218a09..d192ee6fe1c 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -384,7 +384,7 @@ set sql_quote_show_create=1; set sql_safe_updates=1; set sql_select_limit=1; set sql_warnings=1; -set global table_cache=100; +set global table_open_cache=100; set storage_engine=myisam; set global thread_cache_size=100; set timestamp=1, timestamp=default; @@ -516,11 +516,11 @@ SET GLOBAL MYISAM_DATA_POINTER_SIZE= 7; SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE'; Variable_name Value myisam_data_pointer_size 7 -SET GLOBAL table_cache=-1; -SHOW VARIABLES LIKE 'table_cache'; +SET GLOBAL table_open_cache=-1; +SHOW VARIABLES LIKE 'table_open_cache'; Variable_name Value -table_cache 1 -SET GLOBAL table_cache=DEFAULT; +table_open_cache 1 +SET GLOBAL table_open_cache=DEFAULT; set character_set_results=NULL; select ifnull(@@character_set_results,"really null"); ifnull(@@character_set_results,"really null") |