diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-08-15 15:40:09 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-08-22 16:48:46 +0000 |
| commit | 41988245ca6e882bbfb1754200500d61e51e93c5 (patch) | |
| tree | 4ede696cae3552d65783f064ff9bc9fc59234bdf /mysql-test/r | |
| parent | 7fee164faf8fce7be4ebe322d2178efd3d075eae (diff) | |
| download | mariadb-git-bb-10.3-proxy-protocol.tar.gz | |
MDEV-11159 Server proxy protocol supportbb-10.3-proxy-protocol
accept proxy protocol header from client connections.
The new server variable 'proxy_protocol_networks' contains list
of networks from which proxy header is accepted.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/mysql_client_test.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/mysql_client_test_comp.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/mysql_client_test_nonblock.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 7 |
4 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/mysql_client_test.result b/mysql-test/r/mysql_client_test.result index 4ad07b20ab5..83ef8d442b3 100644 --- a/mysql-test/r/mysql_client_test.result +++ b/mysql-test/r/mysql_client_test.result @@ -1,6 +1,7 @@ SET @old_general_log= @@global.general_log; SET @old_slow_query_log= @@global.slow_query_log; call mtr.add_suppression(" Error reading file './client_test_db/test_frm_bug.frm'"); +call mtr.add_suppression(" IP address .* could not be resolved"); ok # cat MYSQL_TMP_DIR/test_wl4435.out.log diff --git a/mysql-test/r/mysql_client_test_comp.result b/mysql-test/r/mysql_client_test_comp.result index b9cac467b92..096331db4f1 100644 --- a/mysql-test/r/mysql_client_test_comp.result +++ b/mysql-test/r/mysql_client_test_comp.result @@ -1,4 +1,5 @@ SET @old_slow_query_log= @@global.slow_query_log; call mtr.add_suppression(" Error reading file './client_test_db/test_frm_bug.frm'"); +call mtr.add_suppression(" IP address .* could not be resolved"); ok SET @@global.slow_query_log= @old_slow_query_log; diff --git a/mysql-test/r/mysql_client_test_nonblock.result b/mysql-test/r/mysql_client_test_nonblock.result index e37e2132b0c..391794f082f 100644 --- a/mysql-test/r/mysql_client_test_nonblock.result +++ b/mysql-test/r/mysql_client_test_nonblock.result @@ -1,6 +1,7 @@ SET @old_general_log= @@global.general_log; SET @old_slow_query_log= @@global.slow_query_log; call mtr.add_suppression(" Error reading file './client_test_db/test_frm_bug.frm'"); +call mtr.add_suppression(" IP address .* could not be resolved"); ok SET @@global.general_log= @old_general_log; SET @@global.slow_query_log= @old_slow_query_log; diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 3bbf149c0ee..42a0ae30d4b 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -782,6 +782,12 @@ The following options may be given as the first argument: Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. + --proxy-protocol-networks=name + Enable proxy protocol for these source networks. The + syntax is a comma separated list of IPv4 and IPv6 + networks. If the network doesn't contain mask, it is + considered to be a single host. "*" represents all + networks and must the only directive on the line. --query-alloc-block-size=# Allocation block size for query parsing and execution --query-cache-limit=# @@ -1436,6 +1442,7 @@ preload-buffer-size 32768 profiling-history-size 15 progress-report-time 5 protocol-version 10 +proxy-protocol-networks query-alloc-block-size 16384 query-cache-limit 1048576 query-cache-min-res-unit 4096 |