MDEV-13855 - Rename idle_readwrite_transaction_timeout to

             idle_write_transaction_timeout

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 

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

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

@@ -1283,28 +1283,28 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	IDLE_READWRITE_TRANSACTION_TIMEOUT
+VARIABLE_NAME	IDLE_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
+VARIABLE_COMMENT	The number of seconds the server waits for 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_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 idle transaction
+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

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

@@ -1409,28 +1409,28 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	IDLE_READWRITE_TRANSACTION_TIMEOUT
+VARIABLE_NAME	IDLE_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
+VARIABLE_COMMENT	The number of seconds the server waits for 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_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 idle transaction
+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

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;

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 @@ class THD :public Statement,
     {
       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
       {

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));