database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-13855 - Rename idle_readwrite_transaction_timeout to

Browse Source 
idle_write_transaction_timeout
This commit is contained in:
Sergey Vojtovich
2017-09-21 17:19:35 +04:00
parent d4b2dfa967
commit 5a8a3c3fe3
7 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/mysqld--help.result
View File

@ -322,12 +322,12 @@ The following options may be given as the first argument:
--idle-readonly-transaction-timeout=# --idle-readonly-transaction-timeout=#
The number of seconds the server waits for read-only idle The number of seconds the server waits for read-only idle
transaction transaction
--idle-readwrite-transaction-timeout=#
The number of seconds the server waits for read-write
idle transaction
--idle-transaction-timeout=# --idle-transaction-timeout=#
The number of seconds the server waits for idle The number of seconds the server waits for idle
transaction transaction
--idle-write-transaction-timeout=#
The number of seconds the server waits for write idle
transaction
--ignore-builtin-innodb --ignore-builtin-innodb
Disable initialization of builtin InnoDB plugin Disable initialization of builtin InnoDB plugin
--ignore-db-dirs=name --ignore-db-dirs=name
@ -1348,8 +1348,8 @@ histogram-size 0
histogram-type SINGLE_PREC_HB histogram-type SINGLE_PREC_HB
host-cache-size 279 host-cache-size 279
idle-readonly-transaction-timeout 0 idle-readonly-transaction-timeout 0
idle-readwrite-transaction-timeout 0
idle-transaction-timeout 0 idle-transaction-timeout 0
idle-write-transaction-timeout 0
ignore-builtin-innodb FALSE ignore-builtin-innodb FALSE
ignore-db-dirs ignore-db-dirs
init-connect init-connect

10
mysql-test/r/transaction_timeout.result
View File

@ -4,8 +4,8 @@ connect c0,localhost,root,,test,,;
SHOW VARIABLES LIKE 'idle_%transaction_timeout'; SHOW VARIABLES LIKE 'idle_%transaction_timeout';
Variable_name Value Variable_name Value
idle_readonly_transaction_timeout 0 idle_readonly_transaction_timeout 0
idle_readwrite_transaction_timeout 0
idle_transaction_timeout 0 idle_transaction_timeout 0
idle_write_transaction_timeout 0
SET autocommit=0; SET autocommit=0;
SET idle_transaction_timeout=1; SET idle_transaction_timeout=1;
BEGIN; BEGIN;
@ -19,8 +19,8 @@ connect c1,localhost,root,,test,,;
SHOW VARIABLES LIKE 'idle_%transaction_timeout'; SHOW VARIABLES LIKE 'idle_%transaction_timeout';
Variable_name Value Variable_name Value
idle_readonly_transaction_timeout 0 idle_readonly_transaction_timeout 0
idle_readwrite_transaction_timeout 0
idle_transaction_timeout 0 idle_transaction_timeout 0
idle_write_transaction_timeout 0
SET autocommit=0; SET autocommit=0;
SET idle_readonly_transaction_timeout=1; SET idle_readonly_transaction_timeout=1;
BEGIN; BEGIN;
@ -29,15 +29,15 @@ a
SELECT * FROM t1; SELECT * FROM t1;
Got one of the listed errors Got one of the listed errors
disconnect c1; disconnect c1;
# Test idle_readwrite_transaction_timeout # Test idle_write_transaction_timeout
connect c2,localhost,root,,test,,; connect c2,localhost,root,,test,,;
SHOW VARIABLES LIKE 'idle_%transaction_timeout'; SHOW VARIABLES LIKE 'idle_%transaction_timeout';
Variable_name Value Variable_name Value
idle_readonly_transaction_timeout 0 idle_readonly_transaction_timeout 0
idle_readwrite_transaction_timeout 0
idle_transaction_timeout 0 idle_transaction_timeout 0
idle_write_transaction_timeout 0
SET autocommit=0; SET autocommit=0;
SET idle_readwrite_transaction_timeout=1; SET idle_write_transaction_timeout=1;
BEGIN; BEGIN;
SELECT * FROM t1; SELECT * FROM t1;
a a

28
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View File

@ -1283,20 +1283,6 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED 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 VARIABLE_NAME IDLE_TRANSACTION_TIMEOUT
SESSION_VALUE 0 SESSION_VALUE 0
GLOBAL_VALUE 0 GLOBAL_VALUE 0
@ -1311,6 +1297,20 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED 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 VARIABLE_NAME IGNORE_BUILTIN_INNODB
SESSION_VALUE NULL SESSION_VALUE NULL
GLOBAL_VALUE OFF GLOBAL_VALUE OFF

28
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@ -1409,20 +1409,6 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED 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 VARIABLE_NAME IDLE_TRANSACTION_TIMEOUT
SESSION_VALUE 0 SESSION_VALUE 0
GLOBAL_VALUE 0 GLOBAL_VALUE 0
@ -1437,6 +1423,20 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED 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 VARIABLE_NAME IGNORE_BUILTIN_INNODB
SESSION_VALUE NULL SESSION_VALUE NULL
GLOBAL_VALUE OFF GLOBAL_VALUE OFF

4
mysql-test/t/transaction_timeout.test
View File

@ -32,11 +32,11 @@ sleep 2;
SELECT * FROM t1; SELECT * FROM t1;
disconnect c1; disconnect c1;
--echo # Test idle_readwrite_transaction_timeout --echo # Test idle_write_transaction_timeout
connect (c2,localhost,root,,test,,); connect (c2,localhost,root,,test,,);
SHOW VARIABLES LIKE 'idle_%transaction_timeout'; SHOW VARIABLES LIKE 'idle_%transaction_timeout';
SET autocommit=0; SET autocommit=0;
SET idle_readwrite_transaction_timeout=1; SET idle_write_transaction_timeout=1;
BEGIN; BEGIN;
SELECT * FROM t1; SELECT * FROM t1;

6
sql/sql_class.h
View File

@ -698,7 +698,7 @@ typedef struct system_variables
uint idle_transaction_timeout; uint idle_transaction_timeout;
uint idle_readonly_transaction_timeout; uint idle_readonly_transaction_timeout;
uint idle_readwrite_transaction_timeout; uint idle_write_transaction_timeout;
uint column_compression_threshold; uint column_compression_threshold;
uint column_compression_zlib_level; uint column_compression_zlib_level;
} SV; } SV;
@ -4531,8 +4531,8 @@ public:
{ {
if (transaction.all.is_trx_read_write()) if (transaction.all.is_trx_read_write())
{ {
if (variables.idle_readwrite_transaction_timeout > 0) if (variables.idle_write_transaction_timeout > 0)
return variables.idle_readwrite_transaction_timeout; return variables.idle_write_transaction_timeout;
} }
else else
{ {

8
sql/sys_vars.cc
View File

@ -3607,10 +3607,10 @@ static Sys_var_uint Sys_idle_readonly_transaction_timeout(
VALID_RANGE(0, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), VALID_RANGE(0, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
DEFAULT(0), BLOCK_SIZE(1)); DEFAULT(0), BLOCK_SIZE(1));
static Sys_var_uint Sys_idle_readwrite_transaction_timeout( static Sys_var_uint Sys_idle_write_transaction_timeout(
"idle_readwrite_transaction_timeout", "idle_write_transaction_timeout",
"The number of seconds the server waits for read-write idle transaction", "The number of seconds the server waits for write idle transaction",
SESSION_VAR(idle_readwrite_transaction_timeout), CMD_LINE(REQUIRED_ARG), SESSION_VAR(idle_write_transaction_timeout), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(0, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), VALID_RANGE(0, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
DEFAULT(0), BLOCK_SIZE(1)); DEFAULT(0), BLOCK_SIZE(1));