Merge branch '2.1' into 2.2

2017-10-03 14:30:06 +03:00
parent 27ccf0877c 9280f1a5d7
commit bd39284f9c
39 changed files with 685 additions and 417 deletions
--- a/server/modules/routing/binlogrouter/blr.h
+++ b/server/modules/routing/binlogrouter/blr.h
@ -1009,6 +1009,7 @@ extern const char *blr_get_encryption_algorithm(int);
 extern int blr_check_encryption_algorithm(char *);
 extern const char *blr_encryption_algorithm_list(void);
 extern bool blr_get_encryption_key(ROUTER_INSTANCE *);
+extern void blr_set_checksum(ROUTER_INSTANCE *instance, GWBUF *buf);
 extern const char *blr_skip_leading_sql_comments(const char *);
 extern bool blr_fetch_mariadb_gtid(ROUTER_SLAVE *,
                                   const char *,