Merge branch '2.1' into 2.2

client/maxadmin.c

@@ -241,7 +241,7 @@ main(int argc, char **argv)
     bool use_unix_socket = false;
 
     int option_index = 0;
-    char c;
+    int c;
     while ((c = getopt_long(argc, argv, "h:p::P:u:S:v?ei",
                             long_options, &option_index)) >= 0)
     {

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