Merge branch '2.1' into 2.2

2017-11-27 09:10:33 +02:00
parent dc2286c774 a418804c83
commit a72956e2f3
22 changed files with 1272 additions and 846 deletions
--- a/server/modules/routing/binlogrouter/blr.h
+++ b/server/modules/routing/binlogrouter/blr.h
@ -532,6 +532,7 @@ typedef struct router_slave
    char              *mariadb_gtid;  /*< MariaDB 10 Slave connects with GTID */
    sqlite3           *gtid_maps;     /*< GTID storage client handle, read only*/
    MARIADB_GTID_INFO f_info;         /*< GTID info for file name prefix */
+    bool              annotate_rows;  /*< MariaDB 10 Slave requests ANNOTATE_ROWS */
 #if defined(SS_DEBUG)
    skygw_chk_t     rses_chk_tail;
 #endif