diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 22:29:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 22:29:05 +0300 |
| commit | 28fad39de718c6c070f357f6d5a72ee6ac4bd804 (patch) | |
| tree | 87f02f09a6473072d1451016c0421dbab7837b4c /sql/log_event_server.cc | |
| parent | da65298f3614f17eeb55608aba7f9044a24d9aa8 (diff) | |
| parent | f98bb23168ee9bc0da8aa7111f35cf2539986387 (diff) | |
| download | mariadb-git-28fad39de718c6c070f357f6d5a72ee6ac4bd804.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/log_event_server.cc')
| -rw-r--r-- | sql/log_event_server.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index 42e20efe382..70b1c1538e9 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -834,8 +834,11 @@ int Log_event_writer::encrypt_and_write(const uchar *pos, size_t len) return 1; uint dstlen; - if (encryption_ctx_update(ctx, pos, (uint)len, dst, &dstlen)) + if (len == 0) + dstlen= 0; + else if (encryption_ctx_update(ctx, pos, (uint)len, dst, &dstlen)) goto err; + if (maybe_write_event_len(dst, dstlen)) return 1; pos= dst; @@ -3196,6 +3199,7 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg, flags2((standalone ? FL_STANDALONE : 0) | (commit_id_arg ? FL_GROUP_COMMIT_ID : 0)) { cache_type= Log_event::EVENT_NO_CACHE; + bool is_tmp_table= thd_arg->lex->stmt_accessed_temp_table(); if (thd_arg->transaction.stmt.trans_did_wait() || thd_arg->transaction.all.trans_did_wait()) flags2|= FL_WAITED; @@ -3204,7 +3208,7 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg, thd_arg->transaction.all.trans_did_ddl() || thd_arg->transaction.all.has_created_dropped_temp_table()) flags2|= FL_DDL; - else if (is_transactional) + else if (is_transactional && !is_tmp_table) flags2|= FL_TRANSACTIONAL; if (!(thd_arg->variables.option_bits & OPTION_RPL_SKIP_PARALLEL)) flags2|= FL_ALLOW_PARALLEL; |