diff options
author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-02-15 13:11:20 +0100 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-02-15 13:11:20 +0100 |
commit | 37fd0bcf633e95833510c5e2aa7f98b0af4866d8 (patch) | |
tree | bb0c01fb81bb25ec67cd52907a419164aeb7ea7d /mysql-test/r/variables.result | |
parent | be3e256d25a853545c6ee04a8bf8e5b5907889c9 (diff) | |
download | mariadb-git-37fd0bcf633e95833510c5e2aa7f98b0af4866d8.tar.gz |
Followup to Bug#45225 Locking: hang if drop table with no timeout
This patch removes the unused server variable
"table_lock_wait_timeout".
mysql-test/r/variables.result:
Updated the test for Bug#28580 to reflect that
"table_lock_wait_timeout" no longer exists.
mysql-test/t/variables.test:
Updated the test for Bug#28580 to reflect that
"table_lock_wait_timeout" no longer exists.
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 a8437961117..3251e9738a5 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1066,11 +1066,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. |