diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-01 10:31:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-01 10:31:08 +0300 |
| commit | 8c5c3a4594101d46f431b0e5eef343ed1fd0ce38 (patch) | |
| tree | 1162c7c8b3d92e9beb9c16f3eb2d1046380f7b68 /storage/innobase | |
| parent | ce1c957ab1021aabef4adbb22d1b7a155e4232ac (diff) | |
| download | mariadb-git-8c5c3a4594101d46f431b0e5eef343ed1fd0ce38.tar.gz | |
MDEV-26067 innodb_lock_wait_timeout values above 100,000,000 are useless
The practical maximum value of the parameter innodb_lock_wait_timeout
is 100,000,000. Any value larger than that specifies an infinite timeout.
Therefore, we should make 100,000,000 the maximum value of the parameter.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/include/ha_prototypes.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 8b97bf07c33..1acb8ef5e20 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -869,9 +869,9 @@ static MYSQL_THDVAR_BOOL(ft_enable_stopword, PLUGIN_VAR_OPCMDARG, NULL, NULL, /* default */ TRUE); -static MYSQL_THDVAR_ULONG(lock_wait_timeout, PLUGIN_VAR_RQCMDARG, - "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.", - NULL, NULL, 50, 0, 1024 * 1024 * 1024, 0); +static MYSQL_THDVAR_UINT(lock_wait_timeout, PLUGIN_VAR_RQCMDARG, + "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. The value 100000000 is infinite timeout.", + NULL, NULL, 50, 0, 100000000, 0); static MYSQL_THDVAR_STR(ft_user_stopword_table, PLUGIN_VAR_OPCMDARG|PLUGIN_VAR_MEMALLOC, @@ -1857,7 +1857,7 @@ thd_has_edited_nontrans_tables( /******************************************************************//** Returns the lock wait timeout for the current connection. @return the lock wait timeout, in seconds */ -ulong +uint thd_lock_wait_timeout( /*==================*/ THD* thd) /*!< in: thread handle, or NULL to query diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h index b65a874177c..9a2786f9e69 100644 --- a/storage/innobase/include/ha_prototypes.h +++ b/storage/innobase/include/ha_prototypes.h @@ -242,7 +242,7 @@ const char *thd_innodb_tmpdir(THD *thd); /******************************************************************//** Returns the lock wait timeout for the current connection. @return the lock wait timeout, in seconds */ -ulong +uint thd_lock_wait_timeout( /*==================*/ THD* thd); /*!< in: thread handle, or NULL to query |