diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-05 20:30:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-05 20:30:57 +0300 |
| commit | 65d0c57c1a2036c8a8c065d3e3bd4f85d0cc5d57 (patch) | |
| tree | 9165f331634b0725bcf628390fcfd8a3381f7147 /mysql-test/include | |
| parent | df97eb1432f91ad13e562111bda393b3650719d0 (diff) | |
| parent | c0eda62aec1de8b74ca51791df5ad142dee2ef08 (diff) | |
| download | mariadb-git-65d0c57c1a2036c8a8c065d3e3bd4f85d0cc5d57.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/ipv6.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/master-slave.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/ipv6.inc b/mysql-test/include/ipv6.inc index 3d8fdcfbc3c..05c65d7817a 100644 --- a/mysql-test/include/ipv6.inc +++ b/mysql-test/include/ipv6.inc @@ -22,4 +22,3 @@ eval SET PASSWORD FOR testuser1@'$IPv6' = PASSWORD ('9876'); --replace_result ::1 localhost SELECT USER(); eval DROP USER testuser1@'$IPv6'; - diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 9ed206b2c22..5b603fbfdb3 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -1,3 +1,5 @@ +--source include/no_valgrind_without_big.inc + # ==== Purpose ==== # # Configure two servers to be replication master and slave. |