From 5a8a3c3fe3d89c6612374d9553d109b6f878ffbc Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 21 Sep 2017 17:19:35 +0400 Subject: [PATCH] MDEV-13855 - Rename idle_readwrite_transaction_timeout to idle_write_transaction_timeout --- mysql-test/r/mysqld--help.result | 8 +++--- mysql-test/r/transaction_timeout.result | 10 +++---- .../sys_vars/r/sysvars_server_embedded.result | 28 +++++++++---------- .../r/sysvars_server_notembedded.result | 28 +++++++++---------- mysql-test/t/transaction_timeout.test | 4 +-- sql/sql_class.h | 6 ++-- sql/sys_vars.cc | 8 +++--- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index bf526567f0a..a6ae5c3e528 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -322,12 +322,12 @@ The following options may be given as the first argument: --idle-readonly-transaction-timeout=# The number of seconds the server waits for read-only idle transaction - --idle-readwrite-transaction-timeout=# - The number of seconds the server waits for read-write - idle transaction --idle-transaction-timeout=# The number of seconds the server waits for idle transaction + --idle-write-transaction-timeout=# + The number of seconds the server waits for write idle + transaction --ignore-builtin-innodb Disable initialization of builtin InnoDB plugin --ignore-db-dirs=name @@ -1348,8 +1348,8 @@ histogram-size 0 histogram-type SINGLE_PREC_HB host-cache-size 279 idle-readonly-transaction-timeout 0 -idle-readwrite-transaction-timeout 0 idle-transaction-timeout 0 +idle-write-transaction-timeout 0 ignore-builtin-innodb FALSE ignore-db-dirs init-connect diff --git a/mysql-test/r/transaction_timeout.result b/mysql-test/r/transaction_timeout.result index c8db4a0e744..95237cf6940 100644 --- a/mysql-test/r/transaction_timeout.result +++ b/mysql-test/r/transaction_timeout.result @@ -4,8 +4,8 @@ connect c0,localhost,root,,test,,; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; Variable_name Value idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 0 idle_transaction_timeout 0 +idle_write_transaction_timeout 0 SET autocommit=0; SET idle_transaction_timeout=1; BEGIN; @@ -19,8 +19,8 @@ connect c1,localhost,root,,test,,; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; Variable_name Value idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 0 idle_transaction_timeout 0 +idle_write_transaction_timeout 0 SET autocommit=0; SET idle_readonly_transaction_timeout=1; BEGIN; @@ -29,15 +29,15 @@ a SELECT * FROM t1; Got one of the listed errors disconnect c1; -# Test idle_readwrite_transaction_timeout +# Test idle_write_transaction_timeout connect c2,localhost,root,,test,,; SHOW VARIABLES LIKE 'idle_%transaction_timeout'; Variable_name Value idle_readonly_transaction_timeout 0 -idle_readwrite_transaction_timeout 0 idle_transaction_timeout 0 +idle_write_transaction_timeout 0 SET autocommit=0; -SET idle_readwrite_transaction_timeout=1; +SET idle_write_transaction_timeout=1; BEGIN; SELECT * FROM t1; a diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 2f31dfca148..cab8cc1ceb1 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -1283,20 +1283,6 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME IDLE_READWRITE_TRANSACTION_TIMEOUT -SESSION_VALUE 0 -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE SESSION -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT The number of seconds the server waits for read-write idle transaction -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 31536000 -NUMERIC_BLOCK_SIZE 1 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME IDLE_TRANSACTION_TIMEOUT SESSION_VALUE 0 GLOBAL_VALUE 0 @@ -1311,6 +1297,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IDLE_WRITE_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for write idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME IGNORE_BUILTIN_INNODB SESSION_VALUE NULL GLOBAL_VALUE OFF diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 7209ac1dda3..232dc7a58f6 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -1409,20 +1409,6 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME IDLE_READWRITE_TRANSACTION_TIMEOUT -SESSION_VALUE 0 -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE SESSION -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT The number of seconds the server waits for read-write idle transaction -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 31536000 -NUMERIC_BLOCK_SIZE 1 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME IDLE_TRANSACTION_TIMEOUT SESSION_VALUE 0 GLOBAL_VALUE 0 @@ -1437,6 +1423,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IDLE_WRITE_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for write idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME IGNORE_BUILTIN_INNODB SESSION_VALUE NULL GLOBAL_VALUE OFF diff --git a/mysql-test/t/transaction_timeout.test b/mysql-test/t/transaction_timeout.test index 36d835cc381..f2a044497c5 100644 --- a/mysql-test/t/transaction_timeout.test +++ b/mysql-test/t/transaction_timeout.test @@ -32,11 +32,11 @@ sleep 2; SELECT * FROM t1; disconnect c1; ---echo # Test idle_readwrite_transaction_timeout +--echo # Test idle_write_transaction_timeout connect (c2,localhost,root,,test,,); SHOW VARIABLES LIKE 'idle_%transaction_timeout'; SET autocommit=0; -SET idle_readwrite_transaction_timeout=1; +SET idle_write_transaction_timeout=1; BEGIN; SELECT * FROM t1; diff --git a/sql/sql_class.h b/sql/sql_class.h index 9cb69f2aa9a..bbe074d9288 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -698,7 +698,7 @@ typedef struct system_variables uint idle_transaction_timeout; uint idle_readonly_transaction_timeout; - uint idle_readwrite_transaction_timeout; + uint idle_write_transaction_timeout; uint column_compression_threshold; uint column_compression_zlib_level; } SV; @@ -4531,8 +4531,8 @@ public: { if (transaction.all.is_trx_read_write()) { - if (variables.idle_readwrite_transaction_timeout > 0) - return variables.idle_readwrite_transaction_timeout; + if (variables.idle_write_transaction_timeout > 0) + return variables.idle_write_transaction_timeout; } else { diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index b74c12bb563..1f94f970e45 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3607,10 +3607,10 @@ static Sys_var_uint Sys_idle_readonly_transaction_timeout( VALID_RANGE(0, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), DEFAULT(0), BLOCK_SIZE(1)); -static Sys_var_uint Sys_idle_readwrite_transaction_timeout( - "idle_readwrite_transaction_timeout", - "The number of seconds the server waits for read-write idle transaction", - SESSION_VAR(idle_readwrite_transaction_timeout), CMD_LINE(REQUIRED_ARG), +static Sys_var_uint Sys_idle_write_transaction_timeout( + "idle_write_transaction_timeout", + "The number of seconds the server waits for write idle transaction", + SESSION_VAR(idle_write_transaction_timeout), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), DEFAULT(0), BLOCK_SIZE(1));