diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-20 12:40:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-20 12:40:21 +0300 |
| commit | 77c6baf6122c5b17bd33c3fbc387a810f51872f7 (patch) | |
| tree | 1d3c315024c2557bae5d03386853272310ae55ed /mysql-test/r/variables.result | |
| parent | 5b1700bbfaf1f13789cc25b21855fbbbf68c481b (diff) | |
| parent | 7ba05466208a5d32d7518152a84754892cf435e9 (diff) | |
| download | mariadb-git-77c6baf6122c5b17bd33c3fbc387a810f51872f7.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 9701a939b19..b46f7c3bada 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1063,11 +1063,9 @@ set global default_storage_engine =@my_storage_engine; set global thread_cache_size =@my_thread_cache_size; set global max_allowed_packet =@my_max_allowed_packet; set global join_buffer_size =@my_join_buffer_size; -show global variables where Variable_name='table_definition_cache' or -Variable_name='table_lock_wait_timeout'; +show global variables where Variable_name='table_definition_cache'; Variable_name Value table_definition_cache # -table_lock_wait_timeout # # -- # -- Bug#34820: log_output can be set to illegal value. |