Merge lp:~sergei.glushchenko/percona-xtrabackup/xb20-databases into lp:percona-xtrabackup/2.0

[Sergei Glushchenko]

Bug 569387
xtrabackup ignores --databases, i.e. when --databases
is specified it affects only innobackupex script,
InnoDB data will be copied fully.
--databases and --databases-file options been introduced
for xtrabackup binary, which cover two modes of --databases
option of innobackupex.

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/325/

[Sergei Glushchenko (sergei.glushchenko)]

have conflicts. looking

[Sergei Glushchenko (sergei.glushchenko)]

conflict resolved

[Laurynas Biveinis (laurynas-biveinis)]

   Code:

   - the commit message does not describe the changes done to
     xtrabackup.c.

   - please make static the variables and functions that are local to
     xtrabackup.c.

   - I don't think table_hash_entries_num is required. Its role can
     be handled by tables_hash != NULL check.

   - Likewise for database_hash_entries_num.

   - use my_malloc(.., MYF(MY_FAE)); instead of plain malloc and its
     result check in xb_new_filter_entry(). Then also the return
     value of xb_new_filter_entry() itself needs not to be checked.

   - please assert in xb_new_filter_entry() that the name does not
     violate MySQL name limits: 64 chars for db name, 64 chars for
     table name, and a dot.

   - Line 243: missing || xtrabackup_database_file? Shouldn't this
     have caused a crash for the new ib_databases_file.sh test? I'd
     replace this by lazy initialization of hash tables that actually
     get any insertions.

   - Lines 243--248: why both hashes are created unconditionally? I
     think the logic should be: init table hash, if any of table or db
     options given; init db hash, if any of db options given.

   - Lines 244 and 246: redundant comments.

   - Line 255: why strtok_r instead of strtok? I don't think the
     reentrancy is needed here?

   - The hash insert code is duplicated for the xtrabackup_databases
     and x_d_file hash insertion in xb_filters_init(), please make a
     function.

   - Please validate the provided names in xb_filter_init against
     length.

   - How are duplicate names handled in the hash tables?

   Testcases:
   - The existing testcases test the IB options and how IB works with
     XB fine. But I think that an XB-specific testcase is necessary
     as well. It should:
     - test the XB options;
     - test invalid input (too long table and database names, non
       existing tables and databases, illegal characters, duplicate
       filters, etc).

   Documentation:
   - diff lines 8 and 9: use "either ... or" instead of "whether", s/-
   or a/, or a.

   - diff line 43: cannot parse "names" in "Only names databases and tables will
     be backed up."

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Code:

> - the commit message does not describe the changes done to
> xtrabackup.c.

Commit message has been changed.

> - please make static the variables and functions that are local to
> xtrabackup.c.

done.

> - I don't think table_hash_entries_num is required. Its role can
> be handled by tables_hash != NULL check.
>
> - Likewise for database_hash_entries_num.

filters init code has been refactored

> - use my_malloc(.., MYF(MY_FAE)); instead of plain malloc and its
> result check in xb_new_filter_entry(). Then also the return
> value of xb_new_filter_entry() itself needs not to be checked.

ut_malloc has been used.

> - please assert in xb_new_filter_entry() that the name does not
> violate MySQL name limits: 64 chars for db name, 64 chars for
> table name, and a dot.
>
> - Line 243: missing || xtrabackup_database_file? Shouldn't this
> have caused a crash for the new ib_databases_file.sh test? I'd
> replace this by lazy initialization of hash tables that actually
> get any insertions.
>
> - Lines 243--248: why both hashes are created unconditionally? I
> think the logic should be: init table hash, if any of table or db
> options given; init db hash, if any of db options given.
>
> - Lines 244 and 246: redundant comments.

filters init code has been refactored

> - Line 255: why strtok_r instead of strtok? I don't think the
> reentrancy is needed here?

I really like strtok_r more because of it design. Don't like functions, which
state is saved globally between invocations.

> - The hash insert code is duplicated for the xtrabackup_databases
> and x_d_file hash insertion in xb_filters_init(), please make a
> function.
>
> - Please validate the provided names in xb_filter_init against
> length.

filters init code has been refactored

> - How are duplicate names handled in the hash tables?

hash tables resolve collisions with linked list, so it will impact on
performance if we have *a lot* of duplicate entries in tables file, or
databases file. I don't think it is a case.

   Testcases:
   - The existing testcases test the IB options and how IB works with
     XB fine. But I think that an XB-specific testcase is necessary
     as well. It should:
     - test the XB options;
     - test invalid input (too long table and database names, non
       existing tables and databases, illegal characters, duplicate
       filters, etc).

> Documentation:
> - diff lines 8 and 9: use "either ... or" instead of "whether", s/-
> or a/, or a.
>
> - diff line 43: cannot parse "names" in "Only names databases and tables will
> be backed up."

fixed

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/340/

[Laurynas Biveinis (laurynas-biveinis)]

   - Please rebase on the current trunk GCAs. The C++ conversion might
     require a tweak or two. Also that will require some testcase
     changes, described below.
   - Please make variable definitions that are local to xtrabackup.c
     static as well, not only functions.
   - Diff line 189: "There aren't tables specified ... " -> "There are
     no tables specified ... "
   - Diff line 240: s/sucessfull/sucessful
   - In xb_register_filter_entry(), please move db_entry declaration
     to the block start.
   - Diff line 412: s/etnries/entries
   - Diff line 434: likewise.
   - After the rebase, ib_databases.sh, ib_databases_file.sh will need to adjust to the
     current stop_server that kill -9s the server and thus encourages
     not a partial but full data dir overwrite to restore. Thus please
     backup mysql and performance_schema as well, and rm -rf the
     whole datadir.
   - In xb_database_options.sh at least some of $XB_BIN $XB_ARGS
     ... can be replaced by xtrabackup ...
   - Does "diff -u <(ls_dir $backup_dir)" fail the test on a diff
     difference found?

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Laurynas,
Thanks for the review, I'd like to rebase this branch on the latest trunk when https://code.launchpad.net/~sergei.glushchenko/percona-xtrabackup/20-bug856400/+merge/152361 will be approved and merged to avoid conflicts and one more rebasing.

Thanks,
Sergei

Unmerged revisions

496. By Sergei Glushchenko on 2013-02-25

Bug 569387
xtrabackup ignores --databases, i.e. when --databases
is specified it affects only innobackupex script,
InnoDB data will be copied fully.
two options have been added for xtrabackup
  * --databases is a space separated list of entries database_name[.table_name]
  * --databases-file is a name of file which contains
          entries database_name[.table_name] one entry per line
  * check_if_skip_table has been modified to check whether database is
    enabled first and after check the table
  * databases and tables filters initialization has been refactored
    in order to avoid code duplication
innnobackupex's --databases option is mapped to one of these options,
depending on value.
Bug 1131084
Unneccessary/debug print in xtrabackup output.
There was msg("xtrabackup: tables regcomp(%s): %s\n", p, errbuf);
which has been removed in this branch.

=== modified file 'doc/source/innobackupex/partial_backups_innobackupex.rst'
--- doc/source/innobackupex/partial_backups_innobackupex.rst	2012-09-19 11:35:43 +0000
+++ doc/source/innobackupex/partial_backups_innobackupex.rst	2013-02-25 08:01:21 +0000
@@ -42,7 +42,7 @@
 Using the :option:`--databases` option
 --------------------------------------
 
-This option is specific to |innobackupex| and accepts whether 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 eigther 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,9 +50,6 @@
 
 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 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 'doc/source/xtrabackup_bin/partial_backups.rst'
--- doc/source/xtrabackup_bin/partial_backups.rst	2011-07-07 05:32:50 +0000
+++ doc/source/xtrabackup_bin/partial_backups.rst	2013-02-25 08:01:21 +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.
 
@@ -30,6 +30,11 @@
 
 |check| errors? outputs?
 
+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 'doc/source/xtrabackup_bin/xbk_option_reference.rst'
--- doc/source/xtrabackup_bin/xbk_option_reference.rst	2012-05-18 11:19:17 +0000
+++ doc/source/xtrabackup_bin/xbk_option_reference.rst	2013-02-25 08:01:21 +0000
@@ -17,6 +17,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:: --defaults-file=#
 
    Only read default options from the given file. Must be given as the first option on the command-line. Must be a real file; it cannot be a symbolic link.

=== modified file 'innobackupex'
--- innobackupex	2013-01-17 15:08:37 +0000
+++ innobackupex	2013-02-25 08:01:21 +0000
@@ -1067,6 +1067,13 @@
     if ($option_stream) {
 	$options = $options . " --stream=$option_stream";
     }
+    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 'src/xtrabackup.c'
--- src/xtrabackup.c	2013-01-13 22:34:01 +0000
+++ src/xtrabackup.c	2013-02-25 08:01:21 +0000
@@ -87,6 +87,7 @@
 #include <log0recv.h>
 #include <fcntl.h>
 #include <buf0lru.h>
+#include <string.h>
 
 #ifdef INNODB_VERSION_SHORT
 #include <ibuf0ibuf.h>
@@ -660,7 +661,7 @@
 
 #ifdef INNODB_VERSION_SHORT
 #define XB_HASH_SEARCH(NAME, TABLE, FOLD, DATA, ASSERTION, TEST) \
-	HASH_SEARCH(NAME, TABLE, FOLD, xtrabackup_tables_t*, DATA, ASSERTION, \
+	HASH_SEARCH(NAME, TABLE, FOLD, xtrabackup_filter_entry_t*, DATA, ASSERTION, \
 		    TEST)
 #else
 #define XB_HASH_SEARCH(NAME, TABLE, FOLD, DATA, ASSERTION, TEST) \
@@ -807,18 +808,30 @@
 char *xtrabackup_incremental_dir = NULL; /* for --prepare */
 
 char *xtrabackup_tables = NULL;
-int tables_regex_num;
-xb_regex_t *tables_regex;
+
+/* 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;
+};
+UT_LIST_BASE_NODE_T(xb_regex_list_node_t) regex_list;
+
 xb_regmatch_t tables_regmatch[1];
 
 char *xtrabackup_tables_file = NULL;
-hash_table_t* tables_hash;
-
-struct xtrabackup_tables_struct{
+hash_table_t* tables_hash = NULL;
+
+char *xtrabackup_databases = NULL;
+char *xtrabackup_databases_file = NULL;
+hash_table_t* databases_hash = NULL;
+
+struct xtrabackup_filter_entry_struct{
 	char*		name;
+	ibool		has_tables_specified;
 	hash_node_t	name_hash;
 };
-typedef struct xtrabackup_tables_struct	xtrabackup_tables_t;
+typedef struct xtrabackup_filter_entry_struct	xtrabackup_filter_entry_t;
 
 #ifdef XTRADB_BASED
 static ulint		thread_nr[SRV_MAX_N_IO_THREADS + 6 + 64];
@@ -1059,6 +1072,8 @@
   OPT_XTRA_INCREMENTAL_DIR,
   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,
@@ -1174,6 +1189,12 @@
   {"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},
@@ -2900,7 +2921,9 @@
 	char *eptr;
 	int dbname_len;
 
-	if (xtrabackup_tables == NULL && xtrabackup_tables_file == NULL) {
+	if (UT_LIST_GET_LEN(regex_list) == 0 &&
+	    tables_hash == NULL &&
+	    databases_hash == NULL) {
 		return(FALSE);
 	}
 
@@ -2916,6 +2939,26 @@
 	}
 
 	strncpy(buf, dbname, FN_REFLEN);
+	buf[tbname - 1 - dbname] = 0;
+
+	if (databases_hash) {
+		/* There are some filters for databases, check them */
+		xtrabackup_filter_entry_t*	database;
+
+		XB_HASH_SEARCH(name_hash, databases_hash, ut_fold_string(buf),
+					database, ut_ad(database->name),
+					!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_specified) {
+			return(FALSE);
+		}
+	}
+
 	buf[FN_REFLEN - 1] = 0;
 	buf[tbname - 1 - dbname] = '.';
 
@@ -2929,11 +2972,13 @@
 		*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], buf, 1,
+	if (UT_LIST_GET_LEN(regex_list)) {
+		/* Check against regular expressions list */
+		int			regres = REG_NOMATCH;
+		xb_regex_list_node_t*	node;
+		for (node = UT_LIST_GET_FIRST(regex_list); node;
+		     node = UT_LIST_GET_NEXT(regex_list, node)) {
+			regres = xb_regexec(&node->regex, buf, 1,
 					    tables_regmatch, 0);
 			if (regres != REG_NOMATCH) {
 				break;
@@ -2944,8 +2989,9 @@
 		}
 	}
 
-	if (xtrabackup_tables_file) {
-		xtrabackup_tables_t*	table;
+	if (tables_hash) {
+		/* Finally, check against full qualified tables list */
+		xtrabackup_filter_entry_t*	table;
 
 		XB_HASH_SEARCH(name_hash, tables_hash, ut_fold_string(buf),
 			       table, ut_ad(table->name),
@@ -4258,6 +4304,242 @@
 	return(FALSE);
 }
 
+/***********************************************************************
+Allocate and initialize the entry for databases and tables filtering
+hash tables. If memory allocation is not successfull, terminate program.
+@return pointer to the created entry.  */
+static
+xtrabackup_filter_entry_t *
+xb_new_filter_entry(
+/*================*/
+	const char*	name)	/*!< in: name of table/database */
+{
+	xtrabackup_filter_entry_t *entry;
+	ulint namelen = strlen(name);
+
+	/* Length of name shouldn't be greater than 129 character,
+	which isn't actually 129 bytes as some of UTF-8 characters
+	for example can be encoded by 4 bytes. */
+	ut_a(namelen <= NAME_LEN * 2 + 1);
+
+	entry = ut_malloc(sizeof(xtrabackup_filter_entry_t) + namelen + 1);
+	memset(entry, '\0', sizeof(xtrabackup_filter_entry_t) + namelen + 1);
+	entry->name = ((char*)entry) + sizeof(xtrabackup_filter_entry_t);
+	strcpy(entry->name, name);
+	entry->has_tables_specified = FALSE;
+
+	return entry;
+}
+
+/***********************************************************************
+Free entry filtering hash table entry.  */
+static
+void
+xb_free_filter_entry(
+/*=================*/
+	xtrabackup_filter_entry_t*	entry)	/*!< in: entry */
+{
+	ut_free(entry);
+}
+
+/***********************************************************************
+Add entry to hash table. If hash table is NULL, allocate and initialize
+new hash table */
+static
+xtrabackup_filter_entry_t*
+xb_add_filter_entry_to_hash(
+/*========================*/
+	const char*	name,	/*!< in: name of table/database */
+	hash_table_t**	hash)	/*!< in/out: hash to insert into */
+{
+	xtrabackup_filter_entry_t*	entry;
+
+	entry = xb_new_filter_entry(name);
+
+	if (UNIV_UNLIKELY(*hash == NULL)) {
+		*hash = hash_create(1000);
+	}
+	HASH_INSERT(xtrabackup_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;
+
+	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;
+
+		xtrabackup_filter_entry_t*	db_entry = NULL;
+
+		if (databases_hash) {
+			XB_HASH_SEARCH(name_hash, databases_hash,
+					ut_fold_string(dbname),
+					db_entry, ut_ad(db_entry->name),
+					!strcmp(db_entry->name, dbname));
+		}
+		if (!db_entry) {
+			db_entry = xb_add_filter_entry_to_hash(dbname,
+							       &databases_hash);
+		}
+		db_entry->has_tables_specified = TRUE;
+		xb_add_filter_entry_to_hash(name, &tables_hash);
+	} else {
+		xb_validate_name(name, namelen);
+
+		xb_add_filter_entry_to_hash(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 = 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 etnries from it.  */
+static
+void
+xb_load_list_string(
+/*================*/
+	const 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 etnries 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);
+	}
+	for (;;) {
+		char*	p = name_buf;
+
+		if (fgets(name_buf, sizeof(name_buf), fp) == 0) {
+			break;
+		}
+
+		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);
+}
+
+
 /************************************************************************
 Inittialize table filters for partial backup. */
 static
@@ -4265,86 +4547,55 @@
 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 = 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;
-		}
+		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 = 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);
-		}
-	}
-}
-
+		xb_load_list_file(xtrabackup_tables_file, xb_register_table);
+	}
+}
+
+
+/************************************************************************
+Release all the hash entries and hash itself. */
+static
+void
+xb_filter_hash_clear(
+	hash_table_t* hash)
+{
+	ulint	i;
+
+	/* free the hash elements */
+	for (i = 0; i < hash_get_n_cells(hash); i++) {
+		xtrabackup_filter_entry_t*	table;
+
+		table = HASH_GET_FIRST(hash, i);
+
+		while (table) {
+			xtrabackup_filter_entry_t*	prev_table = table;
+
+			table = HASH_GET_NEXT(name_hash, prev_table);
+
+			HASH_DELETE(xtrabackup_filter_entry_t, name_hash, hash,
+					ut_fold_string(prev_table->name), prev_table);
+			free(prev_table);
+		}
+	}
+
+	/* free hash */
+	hash_table_free(hash);
+}
 
 /************************************************************************
 Destroy table filters for partial backup. */
@@ -4353,29 +4604,19 @@
 xb_filters_free()
 /*=============*/
 {
-
-	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);
+	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_clear(tables_hash);
+	}
+
+	if (databases_hash) {
+		xb_filter_hash_clear(databases_hash);
 	}
 
 }
@@ -7206,16 +7447,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);
-	}
-
 	xb_regex_end();
 
 	exit(EXIT_SUCCESS);

=== added file 'test/t/ib_databases.sh'
--- test/t/ib_databases.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_databases.sh	2013-02-25 08:01:21 +0000
@@ -0,0 +1,50 @@
+########################################################################
+# 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
+
+# This is a workaround to pass --databases='test test1.b test1.c'
+$IB_BIN $IB_ARGS --no-timestamp --databases='test test1.b test1.c' $topdir/backup
+innobackupex --apply-log $topdir/backup
+vlog "Backup taken"
+
+stop_server
+
+# Restore partial backup
+# Remove database
+rm -rf $mysql_datadir/test/*
+rm -rf $mysql_datadir/test1/*
+vlog "Original database removed"
+
+# Restore database from backup
+cp -rv $topdir/backup/test/* $mysql_datadir/test
+cp -rv $topdir/backup/test1/* $mysql_datadir/test1
+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
+	vlog "Backed up tables set doesn't match filter" ;
+	exit 1;
+fi

=== added file 'test/t/ib_databases_file.sh'
--- test/t/ib_databases_file.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_databases_file.sh	2013-02-25 08:01:21 +0000
@@ -0,0 +1,57 @@
+########################################################################
+# 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
+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/test/*
+rm -rf $mysql_datadir/test1/*
+vlog "Original database removed"
+
+# Restore database from backup
+cp -rv $topdir/backup/test/* $mysql_datadir/test
+cp -rv $topdir/backup/test1/* $mysql_datadir/test1
+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
+	vlog "Backed up tables set don't match filter" ;
+	exit 1;
+fi

=== added file 'test/t/xb_databases_options.sh'
--- test/t/xb_databases_options.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_databases_options.sh	2013-02-25 08:01:21 +0000
@@ -0,0 +1,221 @@
+########################################################################
+# 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 {
+	d=`pwd`
+	cd $1
+	find . -name '*.ibd' | sort
+	cd $d
+}
+
+setup_test
+
+backup_dir=$topdir/backup_dir
+mkdir -p $backup_dir
+
+# invalid characters
+$XB_BIN $XB_ARGS --backup --databases=a/b/c --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is not valid'
+
+# too long name
+$XB_BIN $XB_ARGS --backup --databases=verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# too long name
+$XB_BIN $XB_ARGS --backup --databases=test1.verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is too long'
+
+# not fully qualified name
+$XB_BIN $XB_ARGS --backup --tables-file=<(echo verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow) --target-dir=$backup_dir --datadir=$mysql_datadir 2>&1 | grep 'is not fully qualified'
+
+# again too long name
+$XB_BIN $XB_ARGS --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
+$XB_BIN $XB_ARGS --backup --tables=verylonglonglongname111111skjhkdjhfkjdhgkjdfh1555555555555511stillnotlongenoughsowilladdmore1111111111111111111114848484848484fkjhdjfhkdjfhd8484848aaaaaaaaaancnvjvifmifjhfkmfkfnbfifnfkfik4848484841111111prettyenoughnow --target-dir=$backup_dir --datadir=$mysql_datadir
+rm -rf $backup_dir/*
+
+# should go fine, we cannot validate regex against length
+$XB_BIN $XB_ARGS --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/t.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.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
+$XB_BIN $XB_ARGS --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/t.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./test1/ancor.ibd
+./test1/t.ibd
+./testdatabase/t.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.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
+run_cmd $XB_BIN $XB_ARGS --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=..."
+$XB_BIN $XB_ARGS --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/t.ibd
+./database1/t1.ibd
+./database1/t2.ibd
+./database1/thisisatable.ibd
+./database2/ancor.ibd
+./database2/glow.ibd
+./database2/t.ibd
+./database2/t1.ibd
+./database2/t2.ibd
+./database2/thisisatable.ibd
+./test1/ancor.ibd
+./test1/t.ibd
+./test1/t1.ibd
+./test1/t2.ibd
+./test1/thisisatable.ibd
+./testdatabase/ancor.ibd
+./testdatabase/glow.ibd
+./testdatabase/t.ibd
+./testdatabase/t1.ibd
+./testdatabase/t2.ibd
+./testdatabase/thisisatable.ibd
+./thisisadatabase/ancor.ibd
+./thisisadatabase/glow.ibd
+./thisisadatabase/t.ibd
+./thisisadatabase/t1.ibd
+./thisisadatabase/t2.ibd
+./thisisadatabase/thisisatable.ibd
+EOF
+rm -rf $backup_dir/*