diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:07:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:07:09 +0200 |
| commit | 6fb963be9dc000ef4ee3e002a01e25beb1d01e3a (patch) | |
| tree | 34afe6f3ea9173a0ef494d4a92246ce55b4f46a2 /mysql-test/suite/encryption | |
| parent | a00f8bc3ad3b04b543e2af400289f283fee5427c (diff) | |
| parent | 06401b6818d4f67d3e416785749dcbb8ea3230fb (diff) | |
| download | mariadb-git-10.4-broken-merge.tar.gz | |
WIP broken merge of 10.3 into 10.410.4-broken-merge
Some conflicts in sql/sql_acl.cc were incorrectly resolved,
causing various test failures. Here are some examples:
main.invisible_field_grant_system
main.invisible_field_grant_completely
main.read_only
main.sp-security
main.view_grant
Diffstat (limited to 'mysql-test/suite/encryption')
| -rw-r--r-- | mysql-test/suite/encryption/disabled.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/encryption/disabled.def b/mysql-test/suite/encryption/disabled.def index d92d3495cb8..746faf49873 100644 --- a/mysql-test/suite/encryption/disabled.def +++ b/mysql-test/suite/encryption/disabled.def @@ -12,3 +12,4 @@ innodb_scrub : MDEV-8139 scrubbing does not work reliably innodb_scrub_background : MDEV-8139 scrubbing does not work reliably +innodb-redo-badkey : MDEV-13893/MDEV-12699 fix recovery of corrupted pages |