diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
| commit | f6633bf058802ad7da8196d01fd19d75c53f7274 (patch) | |
| tree | b7ba9832aae2a3d0c72d2bf3d89cf2a5f13a44f6 /sql/log_event.cc | |
| parent | fc5932a1b733b331be20c3f1b45c61c798227dba (diff) | |
| parent | e555540ab6b9c3e0d4fdd00af093b115a9401d0a (diff) | |
| download | mariadb-git-f6633bf058802ad7da8196d01fd19d75c53f7274.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 79e8f7e0a94..26c288ef767 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -7451,8 +7451,10 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg, if (thd_arg->transaction.stmt.trans_did_wait() || thd_arg->transaction.all.trans_did_wait()) flags2|= FL_WAITED; - if (sql_command_flags[thd->lex->sql_command] & - (CF_DISALLOW_IN_RO_TRANS | CF_AUTO_COMMIT_TRANS)) + if (thd_arg->transaction.stmt.trans_did_ddl() || + thd_arg->transaction.stmt.has_created_dropped_temp_table() || + thd_arg->transaction.all.trans_did_ddl() || + thd_arg->transaction.all.has_created_dropped_temp_table()) flags2|= FL_DDL; else if (is_transactional) flags2|= FL_TRANSACTIONAL; |