diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-27 13:36:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-04-27 13:36:36 +0300 |
| commit | 4f16e95310eceb7ff17066b7be43521e8e45c98e (patch) | |
| tree | fbdf09a194d9159401c34792374cdcdab3b31557 /sql/log.cc | |
| parent | ce6616aa284eda7615678e1ccd558172da8de15b (diff) | |
| parent | d0a71e90b8065cfa4122125dce1ad7f3fc6929df (diff) | |
| download | mariadb-git-4f16e95310eceb7ff17066b7be43521e8e45c98e.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index 052ca1d5275..7545d5baed5 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -11980,7 +11980,10 @@ get_gtid_list_event(IO_CACHE *cache, Gtid_list_log_event **out_gtid_list) if (typ == START_ENCRYPTION_EVENT) { if (fdle->start_decryption((Start_encryption_log_event*) ev)) + { errormsg= "Could not set up decryption for binlog."; + break; + } } delete ev; if (typ == ROTATE_EVENT || typ == STOP_EVENT || |