Merge lp:~akopytov/percona-xtrabackup/bug664128 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

    Bug #664128: xtrabackup does not support "--loose-" options

    Added support for all option modifiers supported by upstream MySQL:

    skip, disable, enable, maximum, loose.

    Percona Server supports some additional arguments, but those are
    rarely used especially for InnoDB variables.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/229/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-10-06 10:45:17 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-10-09 06:28:36 +0000
@@ -315,6 +315,8 @@
 parsed from the defaults file */
 static std::ostringstream print_param_str;
 
+static ulonglong global_max_value;
+
 extern "C" sig_handler handle_fatal_signal(int sig);
 
 /* Simple datasink creation tracking...add datasinks in the reverse order you
@@ -6145,61 +6147,45 @@
 		"# This MySQL options file was generated by XtraBackup.\n"
 		"[" << defaults_group << "]\n";
 
-	/* ignore unsupported options */
-	{
-	int i,j,argc_new,find;
-	char *optend, *prev_found = NULL;
-	argc_new = argc;
-
-	j=1;
-	for (i=1 ; i < argc ; i++) {
-		uint count;
-		struct my_option *opt= (struct my_option *) xb_long_options;
-		optend= strcend((argv)[i], '=');
-		if (!strncmp(argv[i], "--defaults-file", optend - argv[i]))
-		{
+	/* Throw a descriptive error if --defaults-file is not the first command
+	line argument */
+	for (int i = 2 ; i < argc ; i++) {
+		char *optend = strcend((argv)[i], '=');
+
+		if (!strncmp(argv[i], "--defaults-file", optend - argv[i])) {
+
 			msg("xtrabackup: Error: --defaults-file "
 			    "must be specified first on the command "
 			    "line\n");
 			exit(EXIT_FAILURE);
 		}
-		for (count= 0; opt->name; opt++) {
-			if (!getopt_compare_strings(opt->name, (argv)[i] + 2,
-				(uint)(optend - (argv)[i] - 2))) /* match found */
-			{
-				if (!opt->name[(uint)(optend - (argv)[i] - 2)]) {
-					find = 1;
-					goto next_opt;
-				}
-				if (!count) {
-					count= 1;
-					prev_found= (char *) opt->name;
-				}
-				else if (strcmp(prev_found, opt->name)) {
-					count++;
-				}
-			}
-		}
-		find = count;
-next_opt:
-		if(!find){
-			argc_new--;
-		} else {
-			(argv)[j]=(argv)[i];
-			j++;
-		}
 	}
-	argc = argc_new;
-	argv[argc] = NULL;
+
+	/* We want xtrabackup to ignore unknown options, because it only
+	recognizes a small subset of server variables */
+	my_getopt_skip_unknown = TRUE;
+
+	/* Reset u_max_value for all options, as we don't want the
+	--maximum-... modifier to set the actual option values */
+	for (my_option *optp= xb_long_options; optp->name; optp++) {
+		optp->u_max_value = (G_PTR *) &global_max_value;
 	}
 
 	if ((ho_error=handle_options(&argc, &argv, xb_long_options, get_one_option)))
 		exit(ho_error);
 
-	if (argc != 0) {
-		msg("xtrabackup: Error: unknown argument: '%s'\n",
-		    argv[0]);
-		exit(EXIT_FAILURE);
+	/* Reject command line arguments that don't look like options, i.e. are
+	not of the form '-X' (single-character options) or '--option' (long
+	options) */
+	for (int i = 1 ; i < argc ; i++) {
+		const char * const opt = argv[i];
+
+		if (strncmp(opt, "--", 2) &&
+		    !(strlen(opt) == 2 && opt[0] == '-')) {
+
+			msg("xtrabackup: Error: unknown argument: '%s'\n", opt);
+			exit(EXIT_FAILURE);
+		}
 	}
 
 	if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
 
=== added file 'storage/innobase/xtrabackup/test/t/bug664128.sh'
--- storage/innobase/xtrabackup/test/t/bug664128.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug664128.sh	2014-10-09 06:28:36 +0000
@@ -0,0 +1,40 @@
+########################################################################
+# Bug #664128: xtrabackup does not support "--loose-" options
+########################################################################
+
+cat >$topdir/my.cnf <<EOF
+[mysqld]
+loose-innodb_log_file_size=5M
+maximum-innodb_log_file_size=6M
+skip-innodb_fast_checksum
+EOF
+
+diff -u - <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+innodb_log_file_size=5242880
+innodb_log_file_size=5242880
+innodb_fast_checksum=0
+EOF
+
+cat >$topdir/my.cnf <<EOF
+[mysqld]
+enable-innodb_fast_checksum
+EOF
+
+diff -u - <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+innodb_fast_checksum=1
+EOF
+
+cat >$topdir/my.cnf <<EOF
+[mysqld]
+disable-innodb_fast_checksum
+EOF
+
+diff -u - <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+innodb_fast_checksum=0
+EOF