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/t | |
| 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/t')
| -rw-r--r-- | mysql-test/t/mysql_client_test-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql_client_test.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql_client_test_comp-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql_client_test_comp.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysql_client_test_nonblock-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql_client_test_nonblock.test | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/t/mysql_client_test-master.opt index fcaf2b69fbc..8d49abf6a10 100644 --- a/mysql-test/t/mysql_client_test-master.opt +++ b/mysql-test/t/mysql_client_test-master.opt @@ -2,3 +2,4 @@ --general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE --max-allowed-packet=32000000 +--proxy-protocol-networks=* diff --git a/mysql-test/t/mysql_client_test.test b/mysql-test/t/mysql_client_test.test index bf5331ca4f9..260473aa0d0 100644 --- a/mysql-test/t/mysql_client_test.test +++ b/mysql-test/t/mysql_client_test.test @@ -7,6 +7,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"); # We run with different binaries for normal and --embedded-server # diff --git a/mysql-test/t/mysql_client_test_comp-master.opt b/mysql-test/t/mysql_client_test_comp-master.opt index 783093c900b..6c4a5e4c782 100644 --- a/mysql-test/t/mysql_client_test_comp-master.opt +++ b/mysql-test/t/mysql_client_test_comp-master.opt @@ -1,2 +1,3 @@ --loose-enable-performance-schema --max-allowed-packet=32000000 +--proxy-protocol-networks=::1/32,127.0.0.0/8,localhost diff --git a/mysql-test/t/mysql_client_test_comp.test b/mysql-test/t/mysql_client_test_comp.test index 0a6b0ba1130..13a9d4944a4 100644 --- a/mysql-test/t/mysql_client_test_comp.test +++ b/mysql-test/t/mysql_client_test_comp.test @@ -9,7 +9,7 @@ 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"); --exec echo "$MYSQL_CLIENT_TEST" > $MYSQLTEST_VARDIR/log/mysql_client_test_comp.out.log 2>&1 --exec $MYSQL_CLIENT_TEST --getopt-ll-test=25600M >> $MYSQLTEST_VARDIR/log/mysql_client_test_comp.out.log 2>&1 diff --git a/mysql-test/t/mysql_client_test_nonblock-master.opt b/mysql-test/t/mysql_client_test_nonblock-master.opt index 5775e707c5f..a39d0089562 100644 --- a/mysql-test/t/mysql_client_test_nonblock-master.opt +++ b/mysql-test/t/mysql_client_test_nonblock-master.opt @@ -1,2 +1,3 @@ --general-log --general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE --max-allowed-packet=32000000 +--proxy-protocol-networks=::1,::ffff:127.0.0.1/97,localhost diff --git a/mysql-test/t/mysql_client_test_nonblock.test b/mysql-test/t/mysql_client_test_nonblock.test index 51263854e58..31de14e4178 100644 --- a/mysql-test/t/mysql_client_test_nonblock.test +++ b/mysql-test/t/mysql_client_test_nonblock.test @@ -6,6 +6,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"); # We run with different binaries for normal and --embedded-server # |