Merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1347698 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Bug 1347698: log parameter on mysqld section shouldn't be read by xtrabackup

Fixed by adding dummy option --log.

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param-new/11/

[Alexey Kopytov (akopytov)]

Sergei,

Looks good except "Ingnoed" and irrelevant comment about --parallel in the test case.

Also, thanks for fixing bug884737.sh, but I don't understand how it could pass Jenkins before the fix? I have verified that the syntax is correct in the 2.2 tree, and that the test fails for me locally in the 2.1 tree. Which looks serious. Any ideas why 2.1 succeeded in Jenkins?

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Hi Alexey,

I fixed the typo and comment in test case. Test bug884737.sh
actually has no reason not to pass in Jenkins. xtrabackup by default
will create backup in the current directory in subdirectory
xtrabackup_backupfiles (i.e. test/xtrabackup_backupfiles). While this
test is only one doing it, it will always pass. Jenkins wipes current
directory for every new run. This test will start failing if there is
another test making backup in test/xtrabackup_backupfiles, or if you
run test suite twice with the same working directory.

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param-new/12/

[Alexey Kopytov (akopytov)]

OK, so the problem is that xtrabackup does not reject arguments which are not prefixed with double dash. Reported as bug #1367377.

review: Approve

=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2014-06-24 09:58:44 +0000
+++ src/xtrabackup.cc	2014-09-09 15:36:06 +0000
@@ -184,6 +184,9 @@
 in milliseconds (default is 1 second) */
 ulint xtrabackup_log_copy_interval = 1000;
 
+/* Ignored option (--log) for MySQL option compatibility */
+char*	log_ignored_opt				= NULL;
+
 /* === metadata of backup === */
 #define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints"
 char metadata_type[30] = ""; /*[full-backuped|full-prepared|incremental]*/
@@ -419,6 +422,7 @@
   OPT_XTRA_ENCRYPT_KEY_FILE,
   OPT_XTRA_ENCRYPT_THREADS,
   OPT_XTRA_ENCRYPT_CHUNK_SIZE,
+  OPT_LOG,
   OPT_INNODB,
   OPT_INNODB_CHECKSUMS,
   OPT_INNODB_DATA_FILE_PATH,
@@ -650,6 +654,10 @@
    (G_PTR*) &xtrabackup_encrypt_chunk_size, (G_PTR*) &xtrabackup_encrypt_chunk_size,
    0, GET_ULL, REQUIRED_ARG, (1 << 16), 1024, ULONGLONG_MAX, 0, 0, 0},
 
+   {"log", OPT_LOG, "Ignored option for MySQL option compatibility",
+   (G_PTR*) &log_ignored_opt, (G_PTR*) &log_ignored_opt, 0,
+   GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+
    {"innodb", OPT_INNODB, "Ignored option for MySQL option compatibility",
    (G_PTR*) &innobase_ignored_opt, (G_PTR*) &innobase_ignored_opt, 0,
    GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 
=== added file 'test/t/bug1347698.sh'
--- test/t/bug1347698.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1347698.sh	2014-09-09 15:36:06 +0000
@@ -0,0 +1,19 @@
+########################################################################
+# Bug #1347698: log parameter on mysqld section shouldn't be read by
+#                xtrabackup
+########################################################################
+
+. inc/common.sh
+
+require_server_version_lower_than 5.6.0
+
+# add --log parameter to [mysqld] section of my.cnf
+MYSQLD_EXTRA_MY_CNF_OPTS="
+log=$MYSQLD_VARDIR/general.log
+"
+
+start_server
+
+vlog "Creating the backup directory: $topdir/backup"
+mkdir -p $topdir/backup
+xtrabackup --backup --target-dir=$topdir/backup
 
=== modified file 'test/t/bug884737.sh'
--- test/t/bug884737.sh	2013-07-30 09:31:12 +0000
+++ test/t/bug884737.sh	2014-09-09 15:36:06 +0000
@@ -10,4 +10,4 @@
 # Check that --parallel=<negative value> doesn't blow up
 vlog "Creating the backup directory: $topdir/backup"
 mkdir -p $topdir/backup
-xtrabackup --backup --parallel=-1 $topdir/backup
+xtrabackup --backup --parallel=-1 --target-dir=$topdir/backup