diff options
author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-20 18:00:59 +0200 |
---|---|---|
committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-20 18:00:59 +0200 |
commit | c06bc668166ed658e6c68a57d9a6ee42b14189e8 (patch) | |
tree | ad9b174e391f7b668a9788cceaa9227467c67b83 /sql/rpl_parallel.cc | |
parent | e1c502879fea4bc95c493e429c295ba8c95e5483 (diff) | |
download | mariadb-git-c06bc668166ed658e6c68a57d9a6ee42b14189e8.tar.gz |
MDEV-11065: Compressed binary log
Minor review comments/changes:
- A bunch of style-fixes.
- Change macros to static inline functions.
- Update check_event_type() with compressed event types.
- Small .result file update.
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r-- | sql/rpl_parallel.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index eeb96d8608a..ec5ea725487 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -645,7 +645,7 @@ is_group_ending(Log_event *ev, Log_event_type event_type) { if (event_type == XID_EVENT) return 1; - if (event_type == QUERY_EVENT) + if (event_type == QUERY_EVENT) // COMMIT/ROLLBACK are never compressed { Query_log_event *qev = (Query_log_event *)ev; if (qev->is_commit()) @@ -2511,7 +2511,7 @@ rpl_parallel::do_event(rpl_group_info *serial_rgi, Log_event *ev, { DBUG_ASSERT(rli->gtid_skip_flag == GTID_SKIP_TRANSACTION); if (typ == XID_EVENT || - (typ == QUERY_EVENT && + (typ == QUERY_EVENT && // COMMIT/ROLLBACK are never compressed (((Query_log_event *)ev)->is_commit() || ((Query_log_event *)ev)->is_rollback()))) rli->gtid_skip_flag= GTID_SKIP_NOT; |