database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-10-06 09:22:39 +03:00
parent 286acaa796 8d6421aa48
commit 6dc157f8a6
117 changed files with 1038 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/ipv6.inc
View File

@@ -22,4 +22,3 @@ eval SET PASSWORD FOR testuser1@'$IPv6' = PASSWORD ('9876');
--replace_result ::1 localhost
SELECT USER();
eval DROP USER testuser1@'$IPv6';

2
mysql-test/include/long_test.inc
View File

@@ -2,3 +2,5 @@
# We can use this to schedule such test early (to not be left with
# only one or two long tests running, and rests of works idle), or to
# run a quick test skipping long-running test cases.
--source include/no_valgrind_without_big.inc

2
mysql-test/include/master-slave.inc
View File

@@ -1,3 +1,5 @@
--source include/no_valgrind_without_big.inc
# ==== Purpose ====
#
# Configure two servers to be replication master and slave.