Auto-merge from mysql-next-4284.

Author: Alexander Nozdrin

include/thr_lock.h

@@ -83,7 +83,6 @@ enum enum_thr_lock_result { THR_LOCK_SUCCESS= 0, THR_LOCK_ABORTED= 1,
 
 
 extern ulong max_write_lock_count;
-extern ulong table_lock_wait_timeout;
 extern my_bool thr_lock_inited;
 extern enum thr_lock_type thr_upgraded_concurrent_insert_lock;
 

mysql-test/r/mysqld--help-notwin.result

@@ -717,10 +717,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 
@@ -983,7 +979,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

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

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.

mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result

@@ -830,8 +830,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.
 
 ###########################################################################
 

mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test

@@ -83,7 +83,6 @@ multiple read locks.
 
 my_bool thr_lock_inited=0;
 ulong locks_immediate = 0L, locks_waited = 0L;
-ulong table_lock_wait_timeout;
 enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
 
 /* The following constants are only for debug output */

mysql-test/t/variables.test

@@ -74,7 +74,20 @@ class Deadlock_detection_context
   MDL_context *start;
   MDL_context *victim;
   uint current_search_depth;
-  static const uint MAX_SEARCH_DEPTH= 1000;
+  /**
+    Maximum depth for deadlock searches. After this depth is
+    achieved we will unconditionally declare that there is a
+    deadlock.
+
+    @note This depth should be small enough to avoid stack
+          being exhausted by recursive search algorithm.
+
+    TODO: Find out what is the optimal value for this parameter.
+          Current value is safe, but probably sub-optimal,
+          as there is an anecdotal evidence that real-life
+          deadlocks are even shorter typically.
+  */
+  static const uint MAX_SEARCH_DEPTH= 32;
 };
 
 

mysys/thr_lock.c

@@ -1954,13 +1954,6 @@ static Sys_var_ulong Sys_table_cache_size(
        VALID_RANGE(1, 512*1024), DEFAULT(TABLE_OPEN_CACHE_DEFAULT),
        BLOCK_SIZE(1));
 
-static Sys_var_ulong Sys_table_lock_wait_timeout(
-       "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",
-       GLOBAL_VAR(table_lock_wait_timeout), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1, 1024*1024*1024), DEFAULT(50), BLOCK_SIZE(1));
-
 static Sys_var_ulong Sys_thread_cache_size(
        "thread_cache_size",
        "How many threads we should keep in a cache for reuse",