diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
commit | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (patch) | |
tree | 5d05c0591e7deef310800a1952a067ad6ad74777 /mysys_ssl | |
parent | a9eb272f9147b2889b95b3f53353e1c735defaba (diff) | |
parent | cacea31687c098c0348deb1e433f4baddd817419 (diff) | |
download | mariadb-git-c41c79650aa2ef8eaf3f887b94db8cc7478eadd1.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysys_ssl')
-rw-r--r-- | mysys_ssl/my_crypt.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc index 4d7ebc7bd27..00447e73d79 100644 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc @@ -101,7 +101,7 @@ public: uchar source_tail[MY_AES_BLOCK_SIZE]; MyCTX_nopad() : MyCTX() { } - ~MyCTX_nopad() { } + ~MyCTX_nopad() = default; int init(const EVP_CIPHER *cipher, int encrypt, const uchar *key, uint klen, const uchar *iv, uint ivlen) |