diff options
| author | Horst.Hunger <horst.hunger@sun.com> | 2009-11-26 09:03:04 +0100 |
|---|---|---|
| committer | Horst.Hunger <horst.hunger@sun.com> | 2009-11-26 09:03:04 +0100 |
| commit | 88eeaa05de8cc299d0ec939344aec554f473b1ea (patch) | |
| tree | f45c8120b52f344e14fbe53941d20d81da795a9d /mysql-test/t | |
| parent | 1792de0af903aa6823be79836cfa4d612bca75ad (diff) | |
| download | mariadb-git-88eeaa05de8cc299d0ec939344aec554f473b1ea.tar.gz | |
Improvements to reduce the output for better reading and more stability.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/ipv4_as_ipv6.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/ipv6.test | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/ipv4_as_ipv6.test b/mysql-test/t/ipv4_as_ipv6.test index 2a8c0922f92..4f4e68e8bfc 100644 --- a/mysql-test/t/ipv4_as_ipv6.test +++ b/mysql-test/t/ipv4_as_ipv6.test @@ -5,6 +5,8 @@ # Test of ipv4 (127.0.0.1) in ipv6 format # Options: --skip-name-resolve, --bind-address=0.0.0.0 (see corresponding opt file). # +# Can't be tested with windows due to mixed format like 0::0000:FFFF:127.0.0.1 +--source include/not_windows.inc # Can't be tested with embedded server --source include/not_embedded.inc @@ -55,7 +57,7 @@ echo =============Test of '::1' ========================; let $IPv6= ::1; --echo connect (con1, $IPv6, root, , test, MASTER_MYPORT,); --disable_query_log ---error 2003 +--error 2003,2006 connect (con1, $IPv6, root, , test, $MASTER_MYPORT,); --enable_query_log diff --git a/mysql-test/t/ipv6.test b/mysql-test/t/ipv6.test index 5896120e60b..a1515e9d533 100644 --- a/mysql-test/t/ipv6.test +++ b/mysql-test/t/ipv6.test @@ -7,6 +7,8 @@ # --source include/check_ipv6.inc +# Can't be tested with windows due to the mixed format like 0:0:0:0:0:FFFF:127.0.0.1 +--source include/not_windows.inc # Can't be tested with embedded server --source include/not_embedded.inc |