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

[Sergei Glushchenko]

Merge fix for bug 1347698 from 2.1 series.

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

[Sergei Glushchenko (sergei.glushchenko)]

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

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-04 16:53:33 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-09 15:38:32 +0000
@@ -199,6 +199,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]*/
@@ -426,6 +429,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,
@@ -630,6 +634,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 'storage/innobase/xtrabackup/test/t/bug1347698.sh'
--- storage/innobase/xtrabackup/test/t/bug1347698.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1347698.sh	2014-09-09 15:38:32 +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