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

Added option for mariadb 10 binlog compatibility

Browse Source 
Added option for mariadb 10 binlog compatibility
This commit is contained in:
MassimilianoPinto
2015-08-26 11:23:05 +02:00
parent 5f328bfcf9
commit e012018e7d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/modules/routing/binlog/maxbinlogcheck.c
View File

@ -71,6 +71,7 @@ static struct option long_options[] = {
{"verbose", no_argument, 0, 'v'}, {"verbose", no_argument, 0, 'v'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, 0, 'V'},
{"fix", no_argument, 0, 'f'}, {"fix", no_argument, 0, 'f'},
{"mariadb10", no_argument, 0, 'M'},
{"help", no_argument, 0, '?'}, {"help", no_argument, 0, '?'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@ -93,8 +94,9 @@ int main(int argc, char **argv) {
int debug_out = 0; int debug_out = 0;
int verbose_out = 0; int verbose_out = 0;
int fix_file = 0; int fix_file = 0;
int mariadb10_compat = 0;
while ((c = getopt_long(argc, argv, "dvVf?", long_options, &option_index)) >= 0) while ((c = getopt_long(argc, argv, "dvVfM?", long_options, &option_index)) >= 0)
{ {
switch (c) { switch (c) {
case 'd': case 'd':
@ -110,6 +112,9 @@ int main(int argc, char **argv) {
case 'f': case 'f':
fix_file = 1; fix_file = 1;
break; break;
case 'M':
mariadb10_compat = 1;
break;
case '?': case '?':
printUsage(*argv); printUsage(*argv);
exit(optopt ? EXIT_FAILURE : EXIT_SUCCESS); exit(optopt ? EXIT_FAILURE : EXIT_SUCCESS);
@ -170,6 +175,9 @@ int main(int argc, char **argv) {
inst->binlog_fd = fd; inst->binlog_fd = fd;
if (mariadb10_compat == 1)
inst->mariadb10_compat = 1;
ptr = strrchr(path, '/'); ptr = strrchr(path, '/');
if (ptr) if (ptr)
strncpy(inst->binlog_name, ptr+1, BINLOG_FNAMELEN); strncpy(inst->binlog_name, ptr+1, BINLOG_FNAMELEN);
@ -224,6 +232,7 @@ printUsage(const char *progname)
printf("Usage: %s [-f] [-d] [-v] [<binlog file>]\n\n", progname); printf("Usage: %s [-f] [-d] [-v] [<binlog file>]\n\n", progname);
printf(" -f|--fix Fix binlog file, require write permissions (truncate)\n"); printf(" -f|--fix Fix binlog file, require write permissions (truncate)\n");
printf(" -d|--debug Print debug messages\n"); printf(" -d|--debug Print debug messages\n");
printf(" -M|--mariadb10 MariaDB 10 binlog compatibility\n");
printf(" -v|--verbose Verbose output\n"); printf(" -v|--verbose Verbose output\n");
printf(" -V|--version print version information and exit\n"); printf(" -V|--version print version information and exit\n");
printf(" -?|--help Print this help text\n"); printf(" -?|--help Print this help text\n");