diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 13:37:21 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-13 13:37:21 +0200 |
commit | 621041b67698b040080b33928883336967687e1e (patch) | |
tree | 75b5591e343f313dab07998b06ddeb4aa76233e3 /sql/item_xmlfunc.h | |
parent | 541500295abdba7fa619065069291ac9c1dd6e83 (diff) | |
parent | 8e613458e1ad797b5e2c7870ffe1c3d5100dbbee (diff) | |
download | mariadb-git-621041b67698b040080b33928883336967687e1e.tar.gz |
Merge 10.0 into 10.1
Also, apply the MDEV-17957 changes to encrypted page checksums,
and remove error message output from the checksum function,
because these messages would be useless noise when mariabackup
is retrying reads of corrupted-looking pages, and not that
useful during normal server operation either.
The error messages in fil_space_verify_crypt_checksum()
should be refactored separately.
Diffstat (limited to 'sql/item_xmlfunc.h')
0 files changed, 0 insertions, 0 deletions