From 077e590bbc60d3b2c20ff5dec039c47414a4ecdd Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sun, 12 Aug 2018 00:13:19 +0100 Subject: [PATCH] MDEV-16277 : Adjust MTR test results. --- mysql-test/main/mysqld--help.result | 4 ++++ .../sys_vars/r/sysvars_server_embedded.result | 14 ++++++++++++++ .../sys_vars/r/sysvars_server_notembedded.result | 14 ++++++++++++++ mysql-test/suite/sys_vars/r/tcp_nodelay.result | 5 +++++ mysql-test/suite/sys_vars/t/tcp_nodelay.test | 7 +++++++ 5 files changed, 44 insertions(+) create mode 100644 mysql-test/suite/sys_vars/r/tcp_nodelay.result create mode 100644 mysql-test/suite/sys_vars/t/tcp_nodelay.test diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 6dcf47cac96..ac490afe229 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1265,6 +1265,9 @@ The following specify which files/extra groups are read (specified before remain first TCP keep-alive packet is sent.If set to 0, system dependent default is used. (Automatically configured unless set explicitly) + --tcp-nodelay Set option TCP_NODELAY (disable Nagle's algorithm) on + socket + (Defaults to on; use --skip-tcp-nodelay to disable.) --thread-cache-size=# How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time @@ -1679,6 +1682,7 @@ tc-heuristic-recover OFF tcp-keepalive-interval 0 tcp-keepalive-probes 0 tcp-keepalive-time 0 +tcp-nodelay TRUE thread-cache-size 151 thread-pool-idle-timeout 60 thread-pool-max-threads 65536 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 feba4a4d248..079f63ba354 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -4198,6 +4198,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TCP_NODELAY +SESSION_VALUE ON +GLOBAL_VALUE ON +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE ON +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Set option TCP_NODELAY (disable Nagle's algorithm) on socket +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE SESSION_VALUE NULL GLOBAL_VALUE 151 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 727e7ee729b..2e2ea63d50a 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -5150,6 +5150,20 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME TCP_NODELAY +SESSION_VALUE ON +GLOBAL_VALUE ON +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE ON +VARIABLE_SCOPE SESSION +VARIABLE_TYPE BOOLEAN +VARIABLE_COMMENT Set option TCP_NODELAY (disable Nagle's algorithm) on socket +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST OFF,ON +READ_ONLY NO +COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME THREAD_CACHE_SIZE SESSION_VALUE NULL GLOBAL_VALUE 151 diff --git a/mysql-test/suite/sys_vars/r/tcp_nodelay.result b/mysql-test/suite/sys_vars/r/tcp_nodelay.result new file mode 100644 index 00000000000..ebb027e8cf6 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/tcp_nodelay.result @@ -0,0 +1,5 @@ +SET tcp_nodelay=0; +SET tcp_nodelay=1; +SET tcp_nodelay=default; +SET GLOBAL tcp_nodelay=0; +ERROR HY000: Variable 'tcp_nodelay' is a SESSION variable diff --git a/mysql-test/suite/sys_vars/t/tcp_nodelay.test b/mysql-test/suite/sys_vars/t/tcp_nodelay.test new file mode 100644 index 00000000000..780bad68039 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/tcp_nodelay.test @@ -0,0 +1,7 @@ +--source include/not_embedded.inc +# A smoke test for tcp_nodelay option +SET tcp_nodelay=0; +SET tcp_nodelay=1; +SET tcp_nodelay=default; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET GLOBAL tcp_nodelay=0;