Merge branch '2.2' into develop

2018-04-24 13:57:50 +03:00
parent ce98831908 2a38902aa6
commit caa964fa57
6 changed files with 69 additions and 22 deletions
--- a/server/modules/routing/binlogrouter/maxbinlogcheck.c
+++ b/server/modules/routing/binlogrouter/maxbinlogcheck.c
@ -88,7 +88,7 @@ int main(int argc, char **argv)
    char *key_file = NULL;
    char *aes_algo = NULL;
    int report_header = 0;
-    char c;
+    int c;
    BINLOG_FILE_FIX binlog_file = {0, false, false};

 #ifdef HAVE_GLIBC