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

[Sergei Glushchenko]

Manual merge from 2.1
http://jenkins.percona.com/job/percona-xtrabackup-2.2-param/181/

[Alexey Kopytov (akopytov)]

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

What will happened with inline comments after repush?

[Alexey Kopytov (akopytov)]

Good question. Let's try and see? :)

[Laurynas Biveinis (laurynas-biveinis)]

They will be available: see for example https://code.launchpad.net/~hrvojem/percona-server/rn-5.1.73-14.2-5.1/+merge/228677, there is a "Show diff comments" link on the top right corner of the "Needs Fixing" box

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/182/
I updated the branch.
Changes are:
- xtrabackup_filter_entry_ -> xb_filter_entry_
- indentation fixes
- System character set is restricted to... comment removed
- Why not just "while (fgets(...))"? -- rewritten with while
- char* p = name_buf; is indeed redundant, removed
- Did you try replacing $@ with "$@" in innobackupex() and quoting the argument, i.e. "--databases='...'"? -- I didm't but I suspected it might work, done and it works
- Could just use die() here and other tests. -- done in 2 places
- xb_add_filter_entry_to_hash shortened to xb_add_filter

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst'
--- storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst	2013-11-14 12:17:21 +0000
+++ storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst	2014-08-26 10:16:47 +0000
@@ -42,7 +42,7 @@
 Using the :option:`--databases` option
 --------------------------------------
 
-This option is specific to |innobackupex| and accepts either a space-separated list of the databases and tables to backup - in the  ``databasename[.tablename]`` form - or a file containing the list at one element per line.
+This option accepts either a space-separated list of the databases and tables to backup - in the  ``databasename[.tablename]`` form - or a file containing the list at one element per line.
 
 For example, ::
 
@@ -50,10 +50,6 @@
 
 The command above will create a timestamped directory with the usual files that |innobackupex| creates, but only containing the data-files related to ``mytable`` in the ``mydatabase`` directory and the ``mysql`` directory with the entire ``mysql`` database.
 
-.. note:: 
- 
- Currently in |Percona XtraBackup| the --databases option has no effect for InnoDB files for both local and streaming backups, i.e. all InnoDB files are always backed up. Currently, only .frm and non-InnoDB tables are limited by that option.
-
 Preparing Partial Backups
 =========================
 

=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst'
--- storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst	2013-04-29 11:08:57 +0000
+++ storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst	2014-08-26 10:16:47 +0000
@@ -2,7 +2,7 @@
  Partial Backups
 =================
 
-|xtrabackup| supports taking partial backups when the :term:`innodb_file_per_table` option is enabled. There are two ways to create partial backups: matching the tables' names with a regular expression or providing a list of them in a file.
+|xtrabackup| supports taking partial backups when the :term:`innodb_file_per_table` option is enabled. There are three ways to create partial backups: matching the tables' names with a regular expression, providing a list of them in a file or providing a list of databases.
 
 .. warning:: If any of the matched or listed tables is deleted during the backup, |xtrabackup| will fail.
 
@@ -31,6 +31,11 @@
   $ echo "mydatabase.mytable" > /tmp/tables.txt
   $ xtrabackup --backup --tables-file=/tmp/tables.txt 
 
+Using the :option:`--databases` and :option:`--databases-file` options
+======================================================================
+
+The ``--databases`` option accepts a space-separated list of the databases and tables to backup - in the ``databasename[.tablename]`` form. The ``--databases-file`` option specifies a file that can contain multiple databases and tables in the ``databasename[.tablename]`` form, one element name per line in the file. Only named databases and tables will be backed up. Names are matched exactly, case-sensitive, with no pattern or regular expression matching.
+
 Preparing the Backup
 ====================
 

=== modified file 'storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst'
--- storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2014-05-18 08:23:31 +0000
+++ storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst	2014-08-26 10:16:47 +0000
@@ -125,6 +125,14 @@
 
    Don't read default options from any option file. Must be given as the first option on the command-line.
 
+.. option:: --databases=#
+
+   This option specifies the list of databases and tables that should be backed up. The option accepts the list of the form ``"databasename1[.table_name1] databasename2[.table_name2] . . ."``.
+
+.. option:: --databases-file=#
+
+   This option specifies the path to the file containing the list of databases and tables that should be backed up. The file can contain the list elements of the form ``databasename1[.table_name1]``, one element per line.
+
 .. option:: --parallel=#
 
    This option specifies the number of threads to use to copy multiple data files concurrently when creating a backup. The default value is 1 (i.e., no concurrent transfer).

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-08-22 13:10:43 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-08-26 10:16:47 +0000
@@ -2850,6 +2850,14 @@
 	$options = $options . " --compact";
     }
 
+    if ($option_databases) {
+        if ($option_databases =~ /^\//) {
+                $options = $options . " --databases_file='$option_databases'";
+        } else {
+                $options = $options . " --databases='$option_databases'";
+        }
+    }
+
     $cmdline = "$option_ibbackup_binary $options";
 
     # run ibbackup as a child process

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-06-24 09:59:50 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-08-26 10:16:47 +0000
@@ -49,6 +49,7 @@
 #include <mysqld.h>
 
 #include <fcntl.h>
+#include <string.h>
 
 #ifdef __linux__
 # include <sys/prctl.h>
@@ -128,21 +129,33 @@
 
 lsn_t xtrabackup_archived_to_lsn = 0; /* for --archived-to-lsn */
 
-char *xtrabackup_tables = NULL;
-int tables_regex_num;
-xb_regex_t *tables_regex;
-xb_regmatch_t tables_regmatch[1];
-
-char *xtrabackup_tables_file = NULL;
-hash_table_t* tables_hash;
-
-hash_table_t* inc_dir_tables_hash;
-
-struct xtrabackup_tables_struct{
+static char *xtrabackup_tables = NULL;
+
+/* List of regular expressions for filtering */
+typedef struct xb_regex_list_node_struct xb_regex_list_node_t;
+struct xb_regex_list_node_struct {
+	UT_LIST_NODE_T(xb_regex_list_node_t)	regex_list;
+	xb_regex_t				regex;
+};
+static UT_LIST_BASE_NODE_T(xb_regex_list_node_t) regex_list;
+
+static xb_regmatch_t tables_regmatch[1];
+
+static char *xtrabackup_tables_file = NULL;
+static hash_table_t* tables_hash = NULL;
+
+static char *xtrabackup_databases = NULL;
+static char *xtrabackup_databases_file = NULL;
+static hash_table_t* databases_hash = NULL;
+
+static hash_table_t* inc_dir_tables_hash;
+
+struct xb_filter_entry_struct{
 	char*		name;
+	ibool		has_tables;
 	hash_node_t	name_hash;
 };
-typedef struct xtrabackup_tables_struct	xtrabackup_tables_t;
+typedef struct xb_filter_entry_struct	xb_filter_entry_t;
 
 static ulint		thread_nr[SRV_MAX_N_IO_THREADS + 6];
 static os_thread_id_t	thread_ids[SRV_MAX_N_IO_THREADS + 6];
@@ -399,6 +412,8 @@
   OPT_XTRA_ARCHIVED_TO_LSN,
   OPT_XTRA_TABLES,
   OPT_XTRA_TABLES_FILE,
+  OPT_XTRA_DATABASES,
+  OPT_XTRA_DATABASES_FILE,
   OPT_XTRA_CREATE_IB_LOGFILE,
   OPT_XTRA_PARALLEL,
   OPT_XTRA_STREAM,
@@ -540,6 +555,13 @@
   {"tables_file", OPT_XTRA_TABLES_FILE, "filtering by list of the exact database.table name in the file.",
    (G_PTR*) &xtrabackup_tables_file, (G_PTR*) &xtrabackup_tables_file,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"databases", OPT_XTRA_DATABASES, "filtering by list of databases.",
+   (G_PTR*) &xtrabackup_databases, (G_PTR*) &xtrabackup_databases,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"databases_file", OPT_XTRA_TABLES_FILE,
+   "filtering by list of databases in the file.",
+   (G_PTR*) &xtrabackup_databases_file, (G_PTR*) &xtrabackup_databases_file,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"create-ib-logfile", OPT_XTRA_CREATE_IB_LOGFILE, "** not work for now** creates ib_logfile* also after '--prepare'. ### If you want create ib_logfile*, only re-execute this command in same options. ###",
    (G_PTR*) &xtrabackup_create_ib_logfile, (G_PTR*) &xtrabackup_create_ib_logfile,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -1611,15 +1633,14 @@
 check_if_table_matches_filters(const char *name)
 {
 	int 			regres;
-	int 			i;
-	xtrabackup_tables_t*	table;
-
-	if (xtrabackup_tables) {
-
-		regres = REG_NOMATCH;
-
-		for (i = 0; i < tables_regex_num; i++) {
-			regres = xb_regexec(&tables_regex[i], name, 1,
+	xb_filter_entry_t*	table;
+	xb_regex_list_node_t*	node;
+
+	if (UT_LIST_GET_LEN(regex_list)) {
+		/* Check against regular expressions list */
+		for (node = UT_LIST_GET_FIRST(regex_list); node;
+		     node = UT_LIST_GET_NEXT(regex_list, node)) {
+			regres = xb_regexec(&node->regex, name, 1,
 					    tables_regmatch, 0);
 			if (regres != REG_NOMATCH) {
 
@@ -1628,10 +1649,9 @@
 		}
 	}
 
-	if (xtrabackup_tables_file) {
-
+	if (tables_hash) {
 		HASH_SEARCH(name_hash, tables_hash, ut_fold_string(name),
-			    xtrabackup_tables_t*,
+			    xb_filter_entry_t*,
 			    table, (void) 0,
 			    !strcmp(table->name, name));
 		if (table) {
@@ -1660,7 +1680,9 @@
 	const char *ptr;
 	char *eptr;
 
-	if (xtrabackup_tables == NULL && xtrabackup_tables_file == NULL) {
+	if (UT_LIST_GET_LEN(regex_list) == 0 &&
+	    tables_hash == NULL &&
+	    databases_hash == NULL) {
 		return(FALSE);
 	}
 
@@ -1676,6 +1698,27 @@
 	}
 
 	strncpy(buf, dbname, FN_REFLEN);
+	buf[tbname - 1 - dbname] = 0;
+
+	if (databases_hash) {
+		/* There are some filters for databases, check them */
+		xb_filter_entry_t*	database;
+
+		HASH_SEARCH(name_hash, databases_hash, ut_fold_string(buf),
+			    xb_filter_entry_t*,
+			    database, (void) 0,
+			    !strcmp(database->name, buf));
+		/* Table's database isn't found, skip the table */
+		if (!database) {
+			return(TRUE);
+		}
+		/* There aren't tables specified for the database,
+		it should be backed up entirely */
+		if (!database->has_tables) {
+			return(FALSE);
+		}
+	}
+
 	buf[FN_REFLEN - 1] = '\0';
 	buf[tbname - 1 - dbname] = '.';
 
@@ -2597,120 +2640,270 @@
 	return(FALSE);
 }
 
+/***********************************************************************
+Allocate and initialize the entry for databases and tables filtering
+hash tables. If memory allocation is not successful, terminate program.
+@return pointer to the created entry.  */
+static
+xb_filter_entry_t *
+xb_new_filter_entry(
+/*================*/
+	const char*	name)	/*!< in: name of table/database */
+{
+	xb_filter_entry_t	*entry;
+	ulint namelen = strlen(name);
+
+	ut_a(namelen <= NAME_LEN * 2 + 1);
+
+	entry = static_cast<xb_filter_entry_t *>
+		(ut_malloc(sizeof(xb_filter_entry_t) + namelen + 1));
+	memset(entry, '\0', sizeof(xb_filter_entry_t) + namelen + 1);
+	entry->name = ((char*)entry) + sizeof(xb_filter_entry_t);
+	strcpy(entry->name, name);
+	entry->has_tables = FALSE;
+
+	return entry;
+}
+
+/***********************************************************************
+Add entry to hash table. If hash table is NULL, allocate and initialize
+new hash table */
+static
+xb_filter_entry_t*
+xb_add_filter(
+/*========================*/
+	const char*	name,	/*!< in: name of table/database */
+	hash_table_t**	hash)	/*!< in/out: hash to insert into */
+{
+	xb_filter_entry_t*	entry;
+
+	entry = xb_new_filter_entry(name);
+
+	if (UNIV_UNLIKELY(*hash == NULL)) {
+		*hash = hash_create(1000);
+	}
+	HASH_INSERT(xb_filter_entry_t,
+		name_hash, *hash,
+		ut_fold_string(entry->name),
+		entry);
+
+	return entry;
+}
+
+/***********************************************************************
+Validate name of table or database. If name is invalid, program will
+be finished with error code */
+static
+void
+xb_validate_name(
+/*=============*/
+	const char*	name,	/*!< in: name */
+	size_t		len)	/*!< in: length of name */
+{
+	const char*	p;
+
+	/* perform only basic validation. validate length and
+	path symbols */
+	if (len > NAME_LEN) {
+		msg("xtrabackup: name `%s` is too long.\n", name);
+		exit(EXIT_FAILURE);
+	}
+	p = strpbrk(name, "/\\~");
+	if (p && p - name < NAME_LEN) {
+		msg("xtrabackup: name `%s` is not valid.\n", name);
+		exit(EXIT_FAILURE);
+	}
+}
+
+/***********************************************************************
+Register new filter entry which can be either database
+or table name.  */
+static
+void
+xb_register_filter_entry(
+/*=====================*/
+	const char*	name)	/*!< in: name */
+{
+	const char*		p;
+	size_t			namelen;
+	xb_filter_entry_t*	db_entry = NULL;
+
+	namelen = strlen(name);
+	if ((p = strchr(name, '.')) != NULL) {
+		char dbname[NAME_LEN + 1];
+
+		xb_validate_name(name, p - name);
+		xb_validate_name(p + 1, namelen - (p - name));
+
+		strncpy(dbname, name, p - name);
+		dbname[p - name] = 0;
+
+		if (databases_hash) {
+			HASH_SEARCH(name_hash, databases_hash,
+					ut_fold_string(dbname),
+					xb_filter_entry_t*,
+					db_entry, (void) 0,
+					!strcmp(db_entry->name, dbname));
+		}
+		if (!db_entry) {
+			db_entry = xb_add_filter(dbname, &databases_hash);
+		}
+		db_entry->has_tables = TRUE;
+		xb_add_filter(name, &tables_hash);
+	} else {
+		xb_validate_name(name, namelen);
+
+		xb_add_filter(name, &databases_hash);
+	}
+}
+
+/***********************************************************************
+Register new table for the filter.  */
+static
+void
+xb_register_table(
+/*==============*/
+	const char* name)	/*!< in: name of table */
+{
+	if (strchr(name, '.') == NULL) {
+		msg("xtrabackup: `%s` is not fully qualified name.\n", name);
+		exit(EXIT_FAILURE);
+	}
+
+	xb_register_filter_entry(name);
+}
+
+/***********************************************************************
+Register new regex for the filter.  */
+static
+void
+xb_register_regex(
+/*==============*/
+	const char* regex)	/*!< in: regex */
+{
+	xb_regex_list_node_t*	node;
+	char			errbuf[100];
+	int			ret;
+
+	node = static_cast<xb_regex_list_node_t *>
+		(ut_malloc(sizeof(xb_regex_list_node_t)));
+
+	ret = xb_regcomp(&node->regex, regex, REG_EXTENDED);
+	if (ret != 0) {
+		xb_regerror(ret, &node->regex, errbuf, sizeof(errbuf));
+		msg("xtrabackup: error: tables regcomp(%s): %s\n",
+			regex, errbuf);
+		exit(EXIT_FAILURE);
+	}
+
+	UT_LIST_ADD_LAST(regex_list, regex_list, node);
+}
+
+typedef void (*insert_entry_func_t)(const char*);
+
+/***********************************************************************
+Scan string and load filter entries from it.  */
+static
+void
+xb_load_list_string(
+/*================*/
+	char* list,			/*!< in: string representing a list */
+	const char* delimiters,		/*!< in: delimiters of entries */
+	insert_entry_func_t ins)	/*!< in: callback to add entry */
+{
+	char*	p;
+	char*	saveptr;
+
+	p = strtok_r(list, delimiters, &saveptr);
+	while (p) {
+
+		ins(p);
+
+		p = strtok_r(NULL, delimiters, &saveptr);
+	}
+}
+
+/***********************************************************************
+Scan file and load filter entries from it.  */
+static
+void
+xb_load_list_file(
+/*==============*/
+	const char* filename,		/*!< in: name of file */
+	insert_entry_func_t ins)	/*!< in: callback to add entry */
+{
+	char	name_buf[NAME_LEN*2+2];
+	FILE*	fp;
+
+	/* read and store the filenames */
+	fp = fopen(filename, "r");
+	if (!fp) {
+		msg("xtrabackup: cannot open %s\n",
+		    filename);
+		exit(EXIT_FAILURE);
+	}
+	while (fgets(name_buf, sizeof(name_buf), fp) != NULL) {
+		char*	p = strchr(name_buf, '\n');
+		if (p) {
+			*p = '\0';
+		} else {
+			msg("xtrabackup: `%s...` name is too long", name_buf);
+			exit(EXIT_FAILURE);
+		}
+
+		ins(name_buf);
+	}
+
+	fclose(fp);
+}
+
+
 static
 void
 xb_filters_init()
 {
+	UT_LIST_INIT(regex_list);
+
+	if (xtrabackup_databases) {
+		xb_load_list_string(xtrabackup_databases, " \t",
+					xb_register_filter_entry);
+	}
+
+	if (xtrabackup_databases_file) {
+		xb_load_list_file(xtrabackup_databases_file,
+					xb_register_filter_entry);
+	}
+
 	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 = static_cast<xb_regex_t *>
-			(ut_malloc(sizeof(xb_regex_t) * tables_regex_num));
-
-		p = xtrabackup_tables;
-		for (i=0; i < tables_regex_num; i++) {
-			int	rc;
-
-			next = strchr(p, ',');
-			ut_a(next || i == tables_regex_num - 1);
-
-			next++;
-			if (i != tables_regex_num - 1)
-				*(next - 1) = '\0';
-
-			rc = xb_regcomp(&tables_regex[i], p,
-					REG_EXTENDED);
-
-			if (rc) {
-
-				xb_regerror(rc, &tables_regex[i], errbuf,
-					    sizeof(errbuf));
-				msg("xtrabackup: regcomp(%s) failed: %s\n",
-				    p, errbuf);
-
-				exit(EXIT_FAILURE);
-			}
-
-			if (i != tables_regex_num - 1)
-				*(next - 1) = ',';
-			p = next;
-		}
+		xb_load_list_string(xtrabackup_tables, ",",
+					xb_register_regex);
 	}
 
 	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 = static_cast<xtrabackup_tables_t *>
-				(ut_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);
-		}
+		xb_load_list_file(xtrabackup_tables_file, xb_register_table);
 	}
 }
 
 static
 void
-xb_tables_hash_free(hash_table_t* hash)
+xb_filter_hash_free(hash_table_t* hash)
 {
 	ulint	i;
 
 	/* free the hash elements */
 	for (i = 0; i < hash_get_n_cells(hash); i++) {
-		xtrabackup_tables_t*	table;
+		xb_filter_entry_t*	table;
 
-		table = static_cast<xtrabackup_tables_t *>
+		table = static_cast<xb_filter_entry_t *>
 			(HASH_GET_FIRST(hash, i));
 
 		while (table) {
-			xtrabackup_tables_t*	prev_table = table;
+			xb_filter_entry_t*	prev_table = table;
 
-			table = static_cast<xtrabackup_tables_t *>
+			table = static_cast<xb_filter_entry_t *>
 				(HASH_GET_NEXT(name_hash, prev_table));
 
-			HASH_DELETE(xtrabackup_tables_t, name_hash, hash,
+			HASH_DELETE(xb_filter_entry_t, name_hash, hash,
 				ut_fold_string(prev_table->name), prev_table);
 			ut_free(prev_table);
 		}
@@ -2726,18 +2919,19 @@
 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) {
-		xb_tables_hash_free(tables_hash);
+	while (UT_LIST_GET_LEN(regex_list) > 0) {
+		xb_regex_list_node_t*	node = UT_LIST_GET_FIRST(regex_list);
+		UT_LIST_REMOVE(regex_list, regex_list, node);
+		xb_regfree(&node->regex);
+		ut_free(node);
+	}
+
+	if (tables_hash) {
+		xb_filter_hash_free(tables_hash);
+	}
+
+	if (databases_hash) {
+		xb_filter_hash_free(databases_hash);
 	}
 }
 
@@ -4239,7 +4433,7 @@
 	fil_space_t*		fil_space;
 	os_file_t		file	= 0;
 	ulint			tablespace_flags;
-	xtrabackup_tables_t*	table;
+	xb_filter_entry_t*	table;
 
 	ut_a(dbname != NULL ||
 	     !fil_is_user_tablespace_id(space_id) ||
@@ -4278,13 +4472,13 @@
 	}
 
 	/* remember space name for further reference */
-	table = static_cast<xtrabackup_tables_t *>
-		(ut_malloc(sizeof(xtrabackup_tables_t) +
+	table = static_cast<xb_filter_entry_t *>
+		(ut_malloc(sizeof(xb_filter_entry_t) +
 			strlen(dest_space_name) + 1));
 
-	table->name = ((char*)table) + sizeof(xtrabackup_tables_t);
+	table->name = ((char*)table) + sizeof(xb_filter_entry_t);
 	strcpy(table->name, dest_space_name);
-	HASH_INSERT(xtrabackup_tables_t, name_hash, inc_dir_tables_hash,
+	HASH_INSERT(xb_filter_entry_t, name_hash, inc_dir_tables_hash,
 			ut_fold_string(table->name), table);
 
 	mutex_enter(&fil_system->mutex);
@@ -4610,14 +4804,14 @@
 	void*		arg __attribute__((unused)))
 {
 	char			name[FN_REFLEN];
-	xtrabackup_tables_t*	table;
+	xb_filter_entry_t*	table;
 
 	snprintf(name, FN_REFLEN, "%s/%s", db_name, file_name);
 	/* Truncate ".ibd" */
 	name[strlen(name) - 4] = '\0';
 
 	HASH_SEARCH(name_hash, inc_dir_tables_hash, ut_fold_string(name),
-		    xtrabackup_tables_t*,
+		    xb_filter_entry_t*,
 		    table, (void) 0,
 		    !strcmp(table->name, name));
 
@@ -5370,7 +5564,7 @@
 
 		if(!xtrabackup_apply_deltas()) {
 			xb_data_files_close();
-			xb_tables_hash_free(inc_dir_tables_hash);
+			xb_filter_hash_free(inc_dir_tables_hash);
 			goto error;
 		}
 	}
@@ -5383,7 +5577,7 @@
 
 		xb_process_datadir("./", ".ibd", rm_if_not_found, NULL);
 
-		xb_tables_hash_free(inc_dir_tables_hash);
+		xb_filter_hash_free(inc_dir_tables_hash);
 	}
 	sync_close();
 	sync_initialized = FALSE;

=== modified file 'storage/innobase/xtrabackup/test/inc/common.sh'
--- storage/innobase/xtrabackup/test/inc/common.sh	2013-11-27 10:55:41 +0000
+++ storage/innobase/xtrabackup/test/inc/common.sh	2014-08-26 10:16:47 +0000
@@ -2,12 +2,12 @@
 
 function innobackupex()
 {
-    run_cmd $IB_BIN $IB_ARGS $*
+    run_cmd $IB_BIN $IB_ARGS "$@"
 }
 
 function xtrabackup()
 {
-    run_cmd $XB_BIN $XB_ARGS $*
+    run_cmd $XB_BIN $XB_ARGS "$@"
 }
 
 function vlog

=== added file 'storage/innobase/xtrabackup/test/t/ib_databases.sh'
--- storage/innobase/xtrabackup/test/t/ib_databases.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/ib_databases.sh	2014-08-26 10:16:47 +0000
@@ -0,0 +1,46 @@
+########################################################################
+# Bug #569387: innobackupex ignores --databases
+#              Testcase covers using --databases option with InnoDB
+#              database (list is specified in option itself)
+########################################################################
+
+. inc/common.sh
+
+start_server --innodb-file-per-table
+
+cat <<EOF | run_cmd $MYSQL $MYSQL_ARGS
+
+	CREATE DATABASE test1;
+
+	CREATE TABLE test1.a (a INT PRIMARY KEY);
+	CREATE TABLE test1.b (b INT PRIMARY KEY);
+	CREATE TABLE test1.c (c INT PRIMARY KEY);
+
+	CREATE TABLE test.a (a INT PRIMARY KEY);
+	CREATE TABLE test.b (b INT PRIMARY KEY);
+	CREATE TABLE test.c (c INT PRIMARY KEY);
+
+EOF
+
+innobackupex --no-timestamp --databases=test\ test1.b\ test1.c\ mysql\ performance_schema $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+# Remove database
+rm -rf $mysql_datadir/*
+vlog "Original database removed"
+
+# Restore database from backup
+innobackupex --copy-back $topdir/backup
+vlog "database restored from backup"
+
+start_server
+
+OUT=`run_cmd $MYSQL $MYSQL_ARGS -e "USE test; SHOW TABLES; USE test1; SHOW TABLES;" | tr -d '\n'`
+
+if [ $OUT != "Tables_in_testabcTables_in_test1bc" ] ; then
+	die "Backed up tables set doesn't match filter"
+fi

=== added file 'storage/innobase/xtrabackup/test/t/ib_databases_file.sh'
--- storage/innobase/xtrabackup/test/t/ib_databases_file.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/ib_databases_file.sh	2014-08-26 10:16:47 +0000
@@ -0,0 +1,56 @@
+########################################################################
+# Bug #569387: innobackupex ignores --databases
+#              Testcase covers using --databases option with InnoDB
+#              database (list is specified in file which option
+#              points to)
+########################################################################
+
+. inc/common.sh
+
+start_server --innodb-file-per-table
+
+cat <<EOF | run_cmd $MYSQL $MYSQL_ARGS
+
+	CREATE DATABASE test1;
+
+	CREATE TABLE test1.a (a INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test1.b (b INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test1.c (c INT PRIMARY KEY) engine=InnoDB;
+
+	CREATE TABLE test.a (a INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test.b (b INT PRIMARY KEY) engine=InnoDB;
+	CREATE TABLE test.c (c INT PRIMARY KEY) engine=InnoDB;
+
+EOF
+
+# Take a backup
+# Backup the whole test and b,c from test1
+cat >$topdir/databases_file <<EOF
+mysql
+performance_schema
+test
+test1.b
+test1.c
+EOF
+innobackupex --no-timestamp --databases=$topdir/databases_file $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+# Remove database
+rm -rf $mysql_datadir/*
+vlog "Original database removed"
+
+# Restore database from backup
+innobackupex --copy-back $topdir/backup
+vlog "database restored from backup"
+
+start_server
+
+OUT=`run_cmd $MYSQL $MYSQL_ARGS -e "USE test; SHOW TABLES; USE test1; SHOW TABLES;" | tr -d '\n'`
+
+if [ $OUT != "Tables_in_testabcTables_in_test1bc" ] ; then
+	die "Backed up tables set doesn't match filter"
+fi

=== added file 'storage/innobase/xtrabackup/test/t/xb_databases_options.sh'
--- storage/innobase/xtrabackup/test/t/xb_databases_options.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/xb_databases_options.sh	2014-08-26 10:16:47 +0000
@@ -0,0 +1,218 @@
+########################################################################
+# Bug #569387: xtrabackup ignores --databases, i.e. when --databases
+#
+# Test following xtrabackup options
+# --databases
+# --databases-file
+# --tables
+# --tables-file
+########################################################################
+
+. inc/common.sh
+
+start_server --innodb-file-per-table
+
+function setup_test {
+
+	cat <<EOF | run_cmd $MYSQL $MYSQL_ARGS
+
+		create database database1;
+		create database database2;
+		create database test1;
+		create database test2;
+		create database thisisadatabase;
+		create database testdatabase;
+
+		create table database1.thisisatable (a int primary key) engine=InnoDB;
+		create table database1.t (a int primary key) engine=InnoDB;
+		create table database1.t1 (a int primary key) engine=InnoDB;
+		create table database1.t2 (a int primary key) engine=InnoDB;
+		create table database1.ancor (a int primary key) engine=InnoDB;
+		create table database1.glow (a int primary key) engine=InnoDB;
+
+		create table database2.thisisatable (a int primary key) engine=InnoDB;
+		create table database2.t (a int primary key) engine=InnoDB;
+		create table database2.t1 (a int primary key) engine=InnoDB;
+		create table database2.t2 (a int primary key) engine=InnoDB;
+		create table database2.ancor (a int primary key) engine=InnoDB;
+		create table database2.glow (a int primary key) engine=InnoDB;
+
+		create table test1.thisisatable (a int primary key) engine=InnoDB;
+		create table test1.t (a int primary key) engine=InnoDB;
+		create table test1.t1 (a int primary key) engine=InnoDB;
+		create table test1.t2 (a int primary key) engine=InnoDB;
+		create table test1.ancor (a int primary key) engine=InnoDB;
+		create table test1.glow (a int primary key) engine=InnoDB;
+
+		create table test2.thisisatable (a int primary key) engine=InnoDB;
+		create table test2.t (a int primary key) engine=InnoDB;
+		create table test2.t1 (a int primary key) engine=InnoDB;
+		create table test2.t2 (a int primary key) engine=InnoDB;
+		create table test2.ancor (a int primary key) engine=InnoDB;
+		create table test2.glow (a int primary key) engine=InnoDB;
+
+		create table thisisadatabase.thisisatable (a int primary key) engine=InnoDB;
+		create table thisisadatabase.t (a int primary key) engine=InnoDB;
+		create table thisisadatabase.t1 (a int primary key) engine=InnoDB;
+		create table thisisadatabase.t2 (a int primary key) engine=InnoDB;
+		create table thisisadatabase.ancor (a int primary key) engine=InnoDB;
+		create table thisisadatabase.glow (a int primary key) engine=InnoDB;
+
+		create table testdatabase.thisisatable (a int primary key) engine=InnoDB;
+		create table testdatabase.t (a int primary key) engine=InnoDB;
+		create table testdatabase.t1 (a int primary key) engine=InnoDB;
+		create table testdatabase.t2 (a int primary key) engine=InnoDB;
+		create table testdatabase.ancor (a int primary key) engine=InnoDB;
+		create table testdatabase.glow (a int primary key) engine=InnoDB;
+
+EOF
+
+}
+
+function ls_dir {
+	( cd $1 ; find . -name '*.ibd' -type f | sort -d )
+}
+
+setup_test
+
+backup_dir=$topdir/backup_dir
+mkdir -p $backup_dir
+
+# invalid characters
+xtrabackup --backup --databases=a/b/c --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is not valid'
+
+# too long name
+xtrabackup --backup --databases=verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# too long name
+xtrabackup --backup --databases=test1.verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# not fully qualified name
+xtrabackup --backup --tables-file=<(echo verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow) --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is not fully qualified'
+
+# again too long name
+xtrabackup --backup --tables-file=<(echo test1.verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow) --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# should go fine, we cannot validate regex against length
+xtrabackup --backup --tables=verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir
+rm -rf $backup_dir/*
+
+# should go fine, we cannot validate regex against length
+xtrabackup --backup --tables=test1.verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir
+rm -rf $backup_dir/*
+
+vlog "Testing with --databases=..."
+$XB_BIN $XB_ARGS --backup --databases='database database2 test1.t test1.ancor thisisadatabase testdatabase.t testdatabase.t7' --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./database2/ancor.ibd
+./database2/glow.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./database2/t.ibd
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.ibd
+./thisisadatabase/t.ibd
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing with --databases-file=..."
+cat >$topdir/list <<EOF
+database
+database2
+test1.t
+test1.ancor
+thisisadatabase
+testdatabase.t
+testdatabase.t7
+EOF
+xtrabackup --backup --databases-file=$topdir/list --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./database2/ancor.ibd
+./database2/glow.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./database2/t.ibd
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.ibd
+./thisisadatabase/t.ibd
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing failure with --tables-file=..."
+cat >$topdir/list <<EOF
+database
+database2
+test1.t
+test1.ancor
+thisisadatabase
+testdatabase.t
+testdatabase.t7
+EOF
+run_cmd_expect_failure $XB_BIN $XB_ARGS --backup --tables-file=$topdir/list --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing with --tables-file=..."
+cat >$topdir/list <<EOF
+test1.t
+test1.ancor
+testdatabase.t
+testdatabase.t7
+EOF
+xtrabackup --backup --tables-file=$topdir/list --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+EOF
+rm -rf $backup_dir/*
+
+vlog "Testing with --tables=..."
+xtrabackup --backup --tables='dat.base,test1.t,test1.a' --target-dir=$backup_dir --datadir=$mysql_datadir
+diff -u <(ls_dir $backup_dir) - <<EOF
+./database1/ancor.ibd
+./database1/glow.ibd
+./database1/t1.ibd
+./database1/t2.ibd
+./database1/thisisatable.ibd
+./database1/t.ibd
+./database2/ancor.ibd
+./database2/glow.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./database2/t.ibd
+./test1/ancor.ibd
+./test1/t1.ibd
+./test1/t2.ibd
+./test1/thisisatable.ibd
+./test1/t.ibd
+./testdatabase/ancor.ibd
+./testdatabase/glow.ibd
+./testdatabase/t1.ibd
+./testdatabase/t2.ibd
+./testdatabase/thisisatable.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.ibd
+./thisisadatabase/t.ibd
+EOF
+rm -rf $backup_dir/*