summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help-win.result
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2010-02-15 13:11:20 +0100
committerJon Olav Hauglid <jon.hauglid@sun.com>2010-02-15 13:11:20 +0100
commit37fd0bcf633e95833510c5e2aa7f98b0af4866d8 (patch)
treebb0c01fb81bb25ec67cd52907a419164aeb7ea7d /mysql-test/r/mysqld--help-win.result
parentbe3e256d25a853545c6ee04a8bf8e5b5907889c9 (diff)
downloadmariadb-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/mysqld--help-win.result')
-rw-r--r--mysql-test/r/mysqld--help-win.result5
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index e48d2a9faa7..2e4e81c0ff0 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -721,10 +721,6 @@ The following options may be given as the first argument:
--table-cache=# Deprecated; use --table-open-cache instead.
--table-definition-cache=#
The number of cached table definitions
- --table-lock-wait-timeout=#
- Timeout in seconds to wait for a table level lock before
- returning an error. Used only if the connection has
- active cursors
--table-open-cache=#
The number of cached open tables
--tc-heuristic-recover=name
@@ -989,7 +985,6 @@ sync-relay-log-info 0
sysdate-is-now FALSE
table-cache 400
table-definition-cache 400
-table-lock-wait-timeout 50
table-open-cache 400
tc-heuristic-recover COMMIT
thread-cache-size 0