database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-05-29 17:34:49 +03:00
parent c98e6d4b3d 6f96ff7268
commit a3539bbb2a
76 changed files with 1593 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog_encryption/encrypted_master.test
View File

@ -18,6 +18,7 @@
# - with annotated events, default checksums and minimal binlog row image
#
--source include/have_partition.inc
--source encryption_algorithms.inc
--source include/have_innodb.inc
--enable_connect_log

1
mysql-test/suite/binlog_encryption/encrypted_slave.test
View File

@ -9,6 +9,7 @@
# relay logs and binary logs are encrypted on slave.
#
--source include/have_partition.inc
--source encryption_algorithms.inc
--source include/have_innodb.inc

1
mysql-test/suite/binlog_encryption/testdata.opt
View File

@ -1 +0,0 @@
--partition