hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Johan Wikman
2018-04-24 12:39:22 +03:00
parent e81dd4ab24 bafe8f5eeb
commit 5cf56c7c0f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/maxadmin.c
View File

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

2
server/modules/routing/binlogrouter/maxbinlogcheck.c
View File

@ -88,7 +88,7 @@ int main(int argc, char **argv)
char *key_file = NULL; char *key_file = NULL;
char *aes_algo = NULL; char *aes_algo = NULL;
int report_header = 0; int report_header = 0;
char c; int c;
BINLOG_FILE_FIX binlog_file = {0, false, false}; BINLOG_FILE_FIX binlog_file = {0, false, false};
#ifdef HAVE_GLIBC #ifdef HAVE_GLIBC