summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2016-11-03 14:48:51 +0100
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-11-03 14:48:51 +0100
commitb002509b67860df9f0634709b5fb8a2ab98d130a (patch)
tree3c1fb6c45a3a2275efc18e003bae531e81b3395e /client
parentd665e79c5b8582f44dc280e5e6df4a8ff4945623 (diff)
parent56a041cde657e5618c519a3c50e8075136d4a1ce (diff)
downloadmariadb-git-b002509b67860df9f0634709b5fb8a2ab98d130a.tar.gz
MDEV-11065: Compressed binary log. Merge code into current 10.2.
Conflicts: sql/share/errmsg-utf8.txt
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 6a52c9fe29a..94443791441 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -1002,6 +1002,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
switch (ev_type) {
case QUERY_EVENT:
+ case QUERY_COMPRESSED_EVENT:
{
Query_log_event *qe= (Query_log_event*)ev;
if (!qe->is_trans_keyword())
@@ -1243,6 +1244,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
case WRITE_ROWS_EVENT_V1:
case UPDATE_ROWS_EVENT_V1:
case DELETE_ROWS_EVENT_V1:
+ case WRITE_ROWS_COMPRESSED_EVENT:
+ case DELETE_ROWS_COMPRESSED_EVENT:
+ case UPDATE_ROWS_COMPRESSED_EVENT:
+ case WRITE_ROWS_COMPRESSED_EVENT_V1:
+ case UPDATE_ROWS_COMPRESSED_EVENT_V1:
+ case DELETE_ROWS_COMPRESSED_EVENT_V1:
{
Rows_log_event *e= (Rows_log_event*) ev;
if (print_row_event(print_event_info, ev, e->get_table_id(),