Merge branch '2.1' into 2.2

2018-04-24 12:39:22 +03:00
parent e81dd4ab24 bafe8f5eeb
commit 5cf56c7c0f
2 changed files with 2 additions and 2 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