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-12-13 16:58:58 +02:00
parent 04efe13501 1dc2f35598
commit a8a5c8a1b8
178 changed files with 1981 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/include/have_file_key_management.inc
View File

@@ -2,3 +2,9 @@ if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'file
{
--skip Test requires file_key_management plugin
}
#
# This file is only included when using encryption. As all encryption test are
# very slow with valgrind, lets disable these if not run with --big
#
--source include/no_valgrind_without_big.inc

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

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