Merge lp:~sergei.glushchenko/percona-xtrabackup/xb21-partial into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Partitioned tables are not correctly handled by the --databases, --include,
--tables-file options of innobackupex, and by the --tables and
--tables-file options of xtrabackup.
Solution is to remove partition suffix (#P#...) before doing filtering.
Testcases cover variants of using filtering options with MyISAM and
InnoDB tables (to test both innobackupex and xtrabackup) with either stream
mode turned on and turned off.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/89/

[Alexey Kopytov (akopytov)]

See comments in https://code.launchpad.net/~sergei.glushchenko/percona-xtrabackup/xb20-partial/+merge/136015

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Conflicts. 2.1 already has check_if_skip_table, you just need to merge your version with it.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

[Stewart Smith (stewart)]

Many test failures when trying to merge: http://jenkins.percona.com/job/merge-XB-2.1-staging/1/

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Failures were caused by changed check_if_skip_table behavior in case of database part of table name is empty. This change force xtrabackup --stats to include also SYS_FOREIGN and SYS_FOREIGN_COLS in it's report.
Tests been fixed simply by changing check COUNT==5 to COUNT==7 both for 2.0 and 2.1 patch.
Jenkins runs:
http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/312/
http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/123/

[Alexey Kopytov (akopytov)]

review: Approve

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

http://jenkins.percona.com/job/merge-XB-2.1-staging/5/BUILD_TYPE=release,Host=centos5-64,xtrabackuptarget=innodb51/
and
http://jenkins.percona.com/job/merge-XB-2.1-staging/4/BUILD_TYPE=release,Host=centos5-64,xtrabackuptarget=innodb51/

failes on centos5-64 pretty consistently.

tail of log is:
121228 8:01:44 InnoDB Plugin 1.0.17 started; log sequence number 59404

[notice (again)]
  If you use binary log and don't use any hack of group commit,
  the binary log position seems to be:
InnoDB: Last MySQL binlog file position 0 1295, file name ./mysql-bin.000001

xtrabackup: starting shutdown with innodb_fast_shutdown = 1
121228 8:01:44 InnoDB: Starting shutdown...
121228 8:01:50 InnoDB: Shutdown completed; log sequence number 59404
121228 08:01:50 innobackupex: completed OK!
2012-12-28 08:01:50: ib_part_include.sh: Backup taken
2012-12-28 08:01:55: ib_part_include.sh: xtrabackup --stats does not work
2012-12-28 08:01:55: run.sh: Found a leftover mysqld processes with PID 22558, stopping it
2012-12-28 08:01:55: run.sh: Found a leftover mysqld processes with PID 11276, stopping it

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

For some weird reason 2>&1 doesn't work nice on Centos 5 with innodb51 flavor. Possibly --stats mix output to stderr and stout or something else happened. Anyways this bug is something different from we are trying to fix here. So, workaround is omit 2&>1. This leaves other parts of test untouched (i.e. 2>&1 was unnecessary). This is what I did.

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/133/BUILD_TYPE=release,Host=centos5-64,xtrabackuptarget=innodb51/

No have failures on Centos 5 x64. Centos 5 32 failed all the tests however. But it is kind of stuff that sometimes happens with Jenkins job.

=== modified file 'innobackupex'
--- innobackupex	2013-01-02 04:23:18 +0000
+++ innobackupex	2013-01-02 16:10:36 +0000
@@ -1992,7 +1992,8 @@
             next unless check_if_required($database, $file);
 
 	    if($option_include) {
-	      if (!("$database.$file" =~ /$option_include/)) {
+	      my $table_name = get_table_name($file);
+	      if (!("$database.$table_name" =~ /$option_include/)) {
 	        print STDERR "$database.$file is skipped because it does not match $option_include.\n";
 	        next;
 	      }
@@ -2314,6 +2315,26 @@
     return ${$group_hash_ref}{$option_name};
 }
 
+# get_table_name subroutine returns table name of specified file.
+#    Parameters:
+#       $_[0]        table path
+#    Return value:
+#       1 table name
+#
+sub get_table_name {
+   my $table_path = shift;
+   my $filename;
+   my $table;
+
+   # get the last component in the table pathname 
+   $filename = (reverse(split(/\//, $table_path)))[0];
+   # get name of the table by removing file suffix
+   $table = (split(/\./, $filename))[0];
+   # and partition suffix
+   $table = (split('#P#', $table))[0];
+
+   return $table;
+}
 
 # check_if_required subroutine returns 1 if the specified database and
 # table needs to be backed up.
@@ -2327,7 +2348,6 @@
    my ( $db, $table_path ) = @_;
    my $db_count  = scalar keys %databases_list;
    my $tbl_count = scalar keys %table_list;
-   my $filename;
    my $table;
 
    if ( $db_count == 0 && $tbl_count == 0 ) {
@@ -2337,10 +2357,7 @@
    }
    else {
       if ( $table_path ) {
-         # get the last component in the table pathname 
-         $filename = (reverse(split(/\//, $table_path)))[0];
-         # get name of the table by removing file suffix
-         $table = (split(/\./, $filename))[0];
+         $table = get_table_name($table_path);
       }
    }
 

=== modified file 'src/xtrabackup.c'
--- src/xtrabackup.c	2012-11-21 13:51:49 +0000
+++ src/xtrabackup.c	2013-01-02 16:10:36 +0000
@@ -1509,71 +1509,71 @@
 my_bool
 check_if_skip_table(
 /******************/
-	char*	path)	/*!< in: path to the table */
+	char*	path,	/*!< in: path to the table */
+	char*	suffix)	/*!< in: suffix */
 {
-	char*	p      = path;
-	char*	next;
-	char*	prev   = NULL;
-	int	p_len;
-	int	regres = REG_NOMATCH;
-	char	tmp;
-	int	i;
+	char buf[FN_REFLEN];
+	const char *dbname, *tbname;
+	const char *ptr;
+	char *eptr;
+	int dbname_len;
 
 	if (xtrabackup_tables == NULL && xtrabackup_tables_file == NULL) {
 		return(FALSE);
 	}
 
-	while ((next = strstr(p, SRV_PATH_SEPARATOR_STR)) != NULL)
-	{
-		prev = p;
-		p = next + 1;
-	}
-	p_len = strlen(p) - sizeof(".ibd") + 1;
-
-	if (p_len < 1) {
-		/* shouldn't happen with a valid path, assume the
-		table should not be filtered */
-		return(FALSE);
-	}
-
-	/* Make "database.table" string */
-	tmp = p[p_len];
-	p[p_len] = 0;
-	*(p - 1) = '.';
+	dbname = NULL;
+	tbname = path;
+	while ((ptr = strstr(tbname, SRV_PATH_SEPARATOR_STR)) != NULL) {
+		dbname = tbname;
+		tbname = ptr + 1;
+	}
+
+	if (dbname == NULL) {
+		return(FALSE);
+	}
+
+	strncpy(buf, dbname, FN_REFLEN);
+	buf[FN_REFLEN - 1] = 0;
+	buf[tbname - 1 - dbname] = '.';
+
+	dbname_len = strlen(dbname) - strlen(suffix);
+	if (dbname_len < 1) {
+		return(FALSE);
+	}
+	buf[dbname_len - 1] = 0;
+
+	if ((eptr = strstr(buf, "#P#")) != NULL) {
+		*eptr = 0;
+	}
 
 	if (xtrabackup_tables) {
+		int regres = REG_NOMATCH;
+		int i;
 		for (i = 0; i < tables_regex_num; i++) {
-			regres = xb_regexec(&tables_regex[i], prev, 1,
+			regres = xb_regexec(&tables_regex[i], buf, 1,
 					    tables_regmatch, 0);
 			if (regres != REG_NOMATCH) {
 				break;
 			}
 		}
 		if (regres == REG_NOMATCH) {
-			goto skip;
+			return(TRUE);
 		}
 	}
 
 	if (xtrabackup_tables_file) {
 		xtrabackup_tables_t*	table;
 
-		*(p - 1) = SRV_PATH_SEPARATOR;
-		XB_HASH_SEARCH(name_hash, tables_hash, ut_fold_string(prev),
+		XB_HASH_SEARCH(name_hash, tables_hash, ut_fold_string(buf),
 			       table, ut_ad(table->name),
-			       !strcmp(table->name, prev));
+			       !strcmp(table->name, buf));
 		if (!table) {
-			goto skip;
+			return(TRUE);
 		}
 	}
 
-	p[p_len] = tmp;
-	*(p - 1) = SRV_PATH_SEPARATOR;
 	return(FALSE);
-
-skip:
-	p[p_len] = tmp;
-	*(p - 1) = SRV_PATH_SEPARATOR;
-	return(TRUE);
 }
 
 /***********************************************************************
@@ -1619,7 +1619,7 @@
 	xb_write_filt_ctxt_t	 write_filt_ctxt;
 
 	if (!trx_sys_sys_space(node->space->id) && /* don't skip system space */
-	    check_if_skip_table(node->name)) {
+	    check_if_skip_table(node->name, "ibd")) {
 		msg("[%02u] Skipping %s\n", thread_n, node->name);
 		return(FALSE);
 	}
@@ -2341,6 +2341,129 @@
 	return(FALSE);
 }
 
+static
+void
+xb_filters_init()
+{
+	if (xtrabackup_tables) {
+		/* init regexp */
+		char *p, *next;
+		int i;
+		char errbuf[100];
+
+		tables_regex_num = 1;
+
+		p = xtrabackup_tables;
+		while ((p = strchr(p, ',')) != NULL) {
+			p++;
+			tables_regex_num++;
+		}
+
+		tables_regex = ut_malloc(sizeof(xb_regex_t) * tables_regex_num);
+
+		p = xtrabackup_tables;
+		for (i=0; i < tables_regex_num; i++) {
+			next = strchr(p, ',');
+			ut_a(next || i == tables_regex_num - 1);
+
+			next++;
+			if (i != tables_regex_num - 1)
+				*(next - 1) = '\0';
+
+			xb_regerror(xb_regcomp(&tables_regex[i], p,
+					       REG_EXTENDED),
+				    &tables_regex[i], errbuf, sizeof(errbuf));
+			msg("xtrabackup: tables regcomp(%s): %s\n", p, errbuf);
+
+			if (i != tables_regex_num - 1)
+				*(next - 1) = ',';
+			p = next;
+		}
+	}
+
+	if (xtrabackup_tables_file) {
+		char name_buf[NAME_LEN*2+2];
+		FILE *fp;
+
+		name_buf[NAME_LEN*2+1] = '\0';
+
+		/* init tables_hash */
+		tables_hash = hash_create(1000);
+
+		/* read and store the filenames */
+		fp = fopen(xtrabackup_tables_file,"r");
+		if (!fp) {
+			msg("xtrabackup: cannot open %s\n",
+			    xtrabackup_tables_file);
+			exit(EXIT_FAILURE);
+		}
+		for (;;) {
+			xtrabackup_tables_t*	table;
+			char*	p = name_buf;
+
+			if ( fgets(name_buf, NAME_LEN*2+1, fp) == 0 ) {
+				break;
+			}
+
+			p = strchr(name_buf, '\n');
+			if (p)
+			{
+				*p = '\0';
+			}
+
+			table = malloc(sizeof(xtrabackup_tables_t) + strlen(name_buf) + 1);
+			memset(table, '\0', sizeof(xtrabackup_tables_t) + strlen(name_buf) + 1);
+			table->name = ((char*)table) + sizeof(xtrabackup_tables_t);
+			strcpy(table->name, name_buf);
+
+			HASH_INSERT(xtrabackup_tables_t, name_hash, tables_hash,
+					ut_fold_string(table->name), table);
+
+			msg("xtrabackup: table '%s' is registered to the "
+			    "list.\n", table->name);
+		}
+	}
+}
+
+static
+void
+xb_filters_free()
+{
+	if (xtrabackup_tables) {
+		/* free regexp */
+		int i;
+
+		for (i = 0; i < tables_regex_num; i++) {
+			xb_regfree(&tables_regex[i]);
+		}
+		ut_free(tables_regex);
+	}
+
+	if (xtrabackup_tables_file) {
+		ulint	i;
+
+		/* free the hash elements */
+		for (i = 0; i < hash_get_n_cells(tables_hash); i++) {
+			xtrabackup_tables_t*	table;
+
+			table = HASH_GET_FIRST(tables_hash, i);
+
+			while (table) {
+				xtrabackup_tables_t*	prev_table = table;
+
+				table = HASH_GET_NEXT(name_hash, prev_table);
+
+				HASH_DELETE(xtrabackup_tables_t, name_hash, tables_hash,
+						ut_fold_string(prev_table->name), prev_table);
+				free(prev_table);
+			}
+		}
+
+		/* free tables_hash */
+		hash_table_free(tables_hash);
+	}
+}
+
 static void
 xtrabackup_backup_func(void)
 {
@@ -2451,6 +2574,8 @@
 	os_sync_mutex = NULL;
 	srv_general_init();
 
+	xb_filters_init();
+
 	{
 	ibool	log_file_created;
 	ibool	log_created	= FALSE;
@@ -2782,6 +2907,8 @@
 	msg("xtrabackup: Transaction log of lsn (%llu) to (%llu) was copied.\n",
 	    checkpoint_lsn_start, log_copy_scanned_lsn);
 
+	xb_filters_free();
+
 	xb_data_files_close();
 }
 
@@ -3066,6 +3193,8 @@
 	if(innodb_init())
 		exit(EXIT_FAILURE);
 
+	xb_filters_init();
+
 	fprintf(stdout, "\n\n<INDEX STATISTICS>\n");
 
 	/* gather stats */
@@ -3140,43 +3269,8 @@
 		mem_free(table_name);
 
 
-		if (xtrabackup_tables) {
-			char *p;
-			int regres = REG_NOMATCH;
-			int i;
-
-			p = strstr(table->name, SRV_PATH_SEPARATOR_STR);
-
-			if (p)
-				*p = '.';
-
-			for (i = 0; i < tables_regex_num; i++) {
-				regres = xb_regexec(&tables_regex[i],
-						    table->name, 1,
-						    tables_regmatch, 0);
-				if (regres != REG_NOMATCH)
-					break;
-			}
-
-			if (p)
-				*p = SRV_PATH_SEPARATOR;
-
-			if ( regres == REG_NOMATCH )
-				goto skip;
-		}
-
-		if (xtrabackup_tables_file) {
-			xtrabackup_tables_t*	xtable;
-
-			XB_HASH_SEARCH(name_hash, tables_hash,
-				       ut_fold_string(table->name),
-				       xtable,
-				       ut_ad(xtable->name),
-				       !strcmp(xtable->name, table->name));
-
-			if (!xtable)
-				goto skip;
-		}
+		if (table && check_if_skip_table(table->name, ""))
+			goto skip;
 
 
 		if (table == NULL) {
@@ -3272,6 +3366,8 @@
 end:
 	putc('\n', stdout);
 
+	xb_filters_free();
+
 	/* shutdown InnoDB */
 	if(innodb_end())
 		exit(EXIT_FAILURE);
@@ -4695,91 +4791,6 @@
 	my_load_path(xtrabackup_real_target_dir, xtrabackup_target_dir, NULL);
 	xtrabackup_target_dir= xtrabackup_real_target_dir;
 
-	if (xtrabackup_tables) {
-		/* init regexp */
-		char *p, *next;
-		int i;
-		char errbuf[100];
-
-		tables_regex_num = 1;
-
-		p = xtrabackup_tables;
-		while ((p = strchr(p, ',')) != NULL) {
-			p++;
-			tables_regex_num++;
-		}
-
-		tables_regex = ut_malloc(sizeof(xb_regex_t) * tables_regex_num);
-
-		p = xtrabackup_tables;
-		for (i=0; i < tables_regex_num; i++) {
-			next = strchr(p, ',');
-			ut_a(next || i == tables_regex_num - 1);
-
-			next++;
-			if (i != tables_regex_num - 1)
-				*(next - 1) = '\0';
-
-			xb_regerror(xb_regcomp(&tables_regex[i], p,
-					       REG_EXTENDED),
-				    &tables_regex[i], errbuf, sizeof(errbuf));
-			msg("xtrabackup: tables regcomp(%s): %s\n", p, errbuf);
-
-			if (i != tables_regex_num - 1)
-				*(next - 1) = ',';
-			p = next;
-		}
-	}
-
-	if (xtrabackup_tables_file) {
-		char name_buf[NAME_LEN*2+2];
-		FILE *fp;
-
-		name_buf[NAME_LEN*2+1] = '\0';
-
-		/* init tables_hash */
-		tables_hash = hash_create(1000);
-
-		/* read and store the filenames */
-		fp = fopen(xtrabackup_tables_file,"r");
-		if (!fp) {
-			msg("xtrabackup: cannot open %s\n",
-			    xtrabackup_tables_file);
-			exit(EXIT_FAILURE);
-		}
-		for (;;) {
-			xtrabackup_tables_t*	table;
-			char*	p = name_buf;
-
-			if ( fgets(name_buf, NAME_LEN*2+1, fp) == 0 ) {
-				break;
-			}
-
-			while (*p != '\0') {
-				if (*p == '.') {
-					*p = '/';
-				}
-				p++;
-			}
-			p = strchr(name_buf, '\n');
-			if (p)
-			{
-				*p = '\0';
-			}
-
-			table = malloc(sizeof(xtrabackup_tables_t) + strlen(name_buf) + 1);
-			memset(table, '\0', sizeof(xtrabackup_tables_t) + strlen(name_buf) + 1);
-			table->name = ((char*)table) + sizeof(xtrabackup_tables_t);
-			strcpy(table->name, name_buf);
-
-			HASH_INSERT(xtrabackup_tables_t, name_hash, tables_hash,
-					ut_fold_string(table->name), table);
-
-			msg("xtrabackup: table '%s' is registered to the "
-			    "list.\n", table->name);
-		}
-	}
-
 #ifdef XTRADB_BASED
 	/* temporary setting of enough size */
 	srv_page_size_shift = UNIV_PAGE_SIZE_SHIFT_MAX;
@@ -4933,40 +4944,6 @@
 	if (xtrabackup_prepare)
 		xtrabackup_prepare_func();
 
-	if (xtrabackup_tables) {
-		/* free regexp */
-		int i;
-
-		for (i = 0; i < tables_regex_num; i++) {
-			xb_regfree(&tables_regex[i]);
-		}
-		ut_free(tables_regex);
-	}
-
-	if (xtrabackup_tables_file) {
-		ulint	i;
-
-		/* free the hash elements */
-		for (i = 0; i < hash_get_n_cells(tables_hash); i++) {
-			xtrabackup_tables_t*	table;
-
-			table = HASH_GET_FIRST(tables_hash, i);
-
-			while (table) {
-				xtrabackup_tables_t*	prev_table = table;
-
-				table = HASH_GET_NEXT(name_hash, prev_table);
-
-				HASH_DELETE(xtrabackup_tables_t, name_hash, tables_hash,
-						ut_fold_string(prev_table->name), prev_table);
-				free(prev_table);
-			}
-		}
-
-		/* free tables_hash */
-		hash_table_free(tables_hash);
-	}
-
 	xb_regex_end();
 
 	exit(EXIT_SUCCESS);

=== added file 'test/inc/ib_part.sh'
--- test/inc/ib_part.sh	1970-01-01 00:00:00 +0000
+++ test/inc/ib_part.sh	2013-01-02 16:10:36 +0000
@@ -0,0 +1,92 @@
+
+
+function check_partitioning()
+{
+   $MYSQL $MYSQL_ARGS -Ns -e "show variables like 'have_partitioning'"
+}
+
+function require_partitioning()
+{
+	PARTITION_CHECK=`check_partitioning`
+
+	if [ -z "$PARTITION_CHECK" ]; then
+	    echo "Requires Partitioning." > $SKIPPED_REASON
+	    exit $SKIPPED_EXIT_CODE
+	fi
+}
+
+function ib_part_schema()
+{
+	topdir=$1
+	engine=$2
+
+	cat <<EOF
+CREATE TABLE test (
+  a int(11) DEFAULT NULL
+) ENGINE=$engine DEFAULT CHARSET=latin1
+PARTITION BY RANGE (a)
+(PARTITION p0 VALUES LESS THAN (100) ENGINE = $engine,
+ PARTITION P1 VALUES LESS THAN (200) ENGINE = $engine,
+ PARTITION p2 VALUES LESS THAN (300)
+   DATA DIRECTORY = '$topdir/ext' INDEX DIRECTORY = '$topdir/ext'
+   ENGINE = $engine,
+ PARTITION p3 VALUES LESS THAN (400)
+   DATA DIRECTORY = '$topdir/ext' INDEX DIRECTORY = '$topdir/ext'
+   ENGINE = $engine,
+ PARTITION p4 VALUES LESS THAN MAXVALUE ENGINE = $engine);
+EOF
+}
+
+function ib_part_data()
+{
+	echo 'INSERT INTO test VALUES (1), (101), (201), (301), (401);';
+}
+
+function ib_part_init()
+{
+	topdir=$1
+	engine=$2
+
+	if [ -d $topdir/ext ] ; then
+		rm -rf $topdir/ext
+	fi
+	mkdir -p $topdir/ext
+
+	ib_part_schema $topdir $engine | run_cmd $MYSQL $MYSQL_ARGS test
+	ib_part_data $topdir $engine | run_cmd $MYSQL $MYSQL_ARGS test
+}
+
+function ib_part_restore()
+{
+	topdir=$1
+	mysql_datadir=$2
+
+	# Remove database
+	rm -rf $mysql_datadir/test/*
+	rm -rf $topdir/ext/*
+	vlog "Original database removed"
+
+	# Restore database from backup
+	cp -rv $topdir/backup/test/* $mysql_datadir/test
+	vlog "database restored from backup"
+
+}
+
+function ib_part_assert_checksum()
+{
+	checksum_a=$1
+
+	vlog "Checking checksums"
+	checksum_b=`checksum_table test test`
+
+	vlog "Checksums are $checksum_a and $checksum_b"
+
+	if [ "$checksum_a" != "$checksum_b" ]
+	then 
+		vlog "Checksums are not equal"
+		exit -1
+	fi
+
+	vlog "Checksums are OK"
+
+}

=== added file 'test/t/ib_part_databases.sh'
--- test/t/ib_part_databases.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_part_databases.sh	2013-01-02 16:10:36 +0000
@@ -0,0 +1,39 @@
+########################################################################
+# Bug #711166: Partitioned tables are not correctly handled by the
+#              --databases and --tables-file options of innobackupex,
+#              and by the --tables option of xtrabackup.
+#              Testcase covers using --databases option with MyISAM
+#              database
+########################################################################
+
+. inc/common.sh
+. inc/ib_part.sh
+
+start_server
+
+require_partitioning
+
+# Create MyISAM partitioned table with some partitions in
+# different location
+ib_part_init $topdir MyISAM
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+cat >$topdir/databases_file <<EOF
+test.test
+EOF
+innobackupex --no-timestamp --databases=$topdir/databases_file $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+ib_part_restore $topdir $mysql_datadir
+
+start_server
+
+# compare checksum
+ib_part_assert_checksum $checksum_a

=== added file 'test/t/ib_part_include.sh'
--- test/t/ib_part_include.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_part_include.sh	2013-01-02 16:10:36 +0000
@@ -0,0 +1,47 @@
+########################################################################
+# Bug #711166: Partitioned tables are not correctly handled by the
+#              --databases and --tables-file options of innobackupex,
+#              and by the --tables option of xtrabackup.
+#              Testcase covers using --include option with InnoDB
+#              database
+########################################################################
+
+. inc/common.sh
+. inc/ib_part.sh
+
+start_server --innodb_file_per_table
+
+require_partitioning
+
+# Create InnoDB partitioned table
+ib_part_init $topdir InnoDB
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+# Only backup of test.test table will be taken
+cat >$topdir/tables <<EOF
+test.test
+EOF
+innobackupex --no-timestamp --include='test.test$' $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+# also test xtrabackup --stats work with --tables-file
+COUNT=`xtrabackup --stats --tables='test.test$' --datadir=$topdir/backup \
+       | grep table: | awk '{print $2}' | sort -u | wc -l`
+
+if [ $COUNT != 7 ] ; then
+	vlog "xtrabackup --stats does not work"
+	exit -1
+fi
+
+stop_server
+
+# Restore partial backup
+ib_part_restore $topdir $mysql_datadir
+
+start_server
+
+ib_part_assert_checksum $checksum_a

=== added file 'test/t/ib_part_include_stream.sh'
--- test/t/ib_part_include_stream.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_part_include_stream.sh	2013-01-02 16:10:36 +0000
@@ -0,0 +1,39 @@
+########################################################################
+# Bug #711166: Partitioned tables are not correctly handled by the
+#              --databases and --tables-file options of innobackupex,
+#              and by the --tables option of xtrabackup.
+#              Testcase covers using --include option with InnoDB
+#              database and --stream mode
+########################################################################
+
+. inc/common.sh
+. inc/ib_part.sh
+
+start_server --innodb_file_per_table
+
+require_partitioning
+
+# Create MyISAM partitioned table
+ib_part_init $topdir MyISAM
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+mkdir -p $topdir/backup
+innobackupex --stream=tar --include='test.test$' $topdir/backup > $topdir/backup/backup.tar
+$TAR ixvf $topdir/backup/backup.tar -C $topdir/backup 
+$TAR cvhf $topdir/backup/backup11.tar $mysql_datadir/test/*
+
+innobackupex --apply-log $topdir/backup
+
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+ib_part_restore $topdir $mysql_datadir
+
+start_server
+
+ib_part_assert_checksum $checksum_a

=== added file 'test/t/ib_part_tf_innodb.sh'
--- test/t/ib_part_tf_innodb.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_part_tf_innodb.sh	2013-01-02 16:10:36 +0000
@@ -0,0 +1,46 @@
+########################################################################
+# Bug #711166: Partitioned tables are not correctly handled by the
+#              --databases and --tables-file options of innobackupex,
+#              and by the --tables option of xtrabackup.
+#              Testcase covers using --tables-file option with InnoDB
+#              database
+########################################################################
+
+. inc/common.sh
+. inc/ib_part.sh
+
+start_server --innodb_file_per_table
+
+require_partitioning
+
+# Create InnoDB partitioned table
+ib_part_init $topdir InnoDB
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+# Only backup of test.test table will be taken
+cat >$topdir/tables <<EOF
+test.test
+EOF
+innobackupex --no-timestamp --tables-file=$topdir/tables $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+COUNT=`xtrabackup --stats --tables-file=$topdir/tables --datadir=$topdir/backup \
+       | grep table: | awk '{print $2}' | sort -u | wc -l`
+echo "COUNT = $COUNT"
+if [ $COUNT != 7 ] ; then
+	vlog "xtrabackup --stats does not work"
+	exit -1
+fi
+
+stop_server
+
+# Restore partial backup
+ib_part_restore $topdir $mysql_datadir
+
+start_server
+
+ib_part_assert_checksum $checksum_a

=== added file 'test/t/ib_part_tf_innodb_stream.sh'
--- test/t/ib_part_tf_innodb_stream.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_part_tf_innodb_stream.sh	2013-01-02 16:10:36 +0000
@@ -0,0 +1,40 @@
+########################################################################
+# Bug #711166: Partitioned tables are not correctly handled by the
+#              --databases and --tables-file options of innobackupex,
+#              and by the --tables option of xtrabackup.
+#              Testcase covers using --tables-file option with InnoDB
+#              database and --stream mode
+########################################################################
+
+. inc/common.sh
+. inc/ib_part.sh
+
+start_server --innodb_file_per_table
+
+require_partitioning
+
+# Create InnoDB partitioned table
+ib_part_init $topdir InnoDB
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+# Only backup of test.test table will be taken
+cat >$topdir/tables <<EOF
+test.test
+EOF
+mkdir -p $topdir/backup
+innobackupex --stream=tar --no-timestamp --tables-file=$topdir/tables $topdir/backup > $topdir/backup/backup.tar
+$TAR ixvf $topdir/backup/backup.tar -C $topdir/backup 
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+ib_part_restore $topdir $mysql_datadir
+
+start_server
+
+ib_part_assert_checksum $checksum_a

=== added file 'test/t/ib_part_tf_myisam.sh'
--- test/t/ib_part_tf_myisam.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_part_tf_myisam.sh	2013-01-02 16:10:36 +0000
@@ -0,0 +1,39 @@
+########################################################################
+# Bug #711166: Partitioned tables are not correctly handled by the
+#              --databases and --tables-file options of innobackupex,
+#              and by the --tables option of xtrabackup.
+#              Testcase covers using --tables-file option with MyISAM
+#              database
+########################################################################
+
+. inc/common.sh
+. inc/ib_part.sh
+
+start_server
+
+require_partitioning
+
+# Create MyISAM partitioned table with some partitions in
+# different location
+ib_part_init $topdir MyISAM
+
+# Saving the checksum of original table
+checksum_a=`checksum_table test test`
+
+# Take a backup
+# Only backup of test.test table will be taken
+cat >$topdir/tables <<EOF
+test.test
+EOF
+innobackupex --no-timestamp --tables-file=$topdir/tables $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+ib_part_restore $topdir $mysql_datadir
+
+start_server
+
+ib_part_assert_checksum $checksum_a