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 | fca241584f7c80adbc420955dd569db05f37c5bb (patch) | |
| tree | 1d3c315024c2557bae5d03386853272310ae55ed /mysql-test/t/variables.test | |
| parent | c42767e52ebd6b61556dde6ba43a90a8e46c241e (diff) | |
| parent | f027e4e00f0c4ecef89b635ae2ab1e48eb076bff (diff) | |
| download | mariadb-git-fca241584f7c80adbc420955dd569db05f37c5bb.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index cab37510931..39fa78ef370 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -829,8 +829,8 @@ set global join_buffer_size =@my_join_buffer_size; # Bug#28580 Repeatation of status variables # --replace_column 2 # -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'; +# Note: table_lock_wait_timeout no longer exists. See bug#45225. ########################################################################### |