Merge lp:~sergei.glushchenko/percona-xtrabackup/xb2.0-bug989397 into lp:percona-xtrabackup/2.0

[Sergei Glushchenko]

Bug989397: InnoDB tables with names *opt*, *par*, *CSV*, *MYD*
and so on backed up twice.
Such tables were backed up by xtrabackup binary and by innobackupex
script. Regexp for filtering database directory contents was fixed.

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/181/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-05-15 09:30:50 +0000
+++ innobackupex	2012-05-17 13:40:23 +0000
@@ -2008,7 +2008,7 @@
 
         # copy files of this database
 	opendir(DBDIR, "$source_dir/$database");
-	@list = grep(/\.(frm)|(MYD)|(MYI)|(MRG)|(TRG)|(TRN)|(ARM)|(ARZ)|(CSM)|(CSV)|(opt)|(par)$/, readdir(DBDIR)); 
+	@list = grep(/\.(frm|MYD|MYI|MRG|TRG|TRN|ARM|ARZ|CSM|CSV|opt|par)$/, readdir(DBDIR)); 
 	closedir DBDIR;
         $file_c = @list;
         if ($file_c <= $backup_file_print_limit) {

=== added file 'test/t/bug989397.sh'
--- test/t/bug989397.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug989397.sh	2012-05-17 13:40:23 +0000
@@ -0,0 +1,19 @@
+############################################################################
+# Bug989397: InnoDB tables with names *opt*, *par*, *CSV*, *MYD* and so on
+# backed up twice
+############################################################################
+
+. inc/common.sh
+
+init
+run_mysqld --innodb_file_per_table
+
+# create table which name ends with opt
+${MYSQL} ${MYSQL_ARGS} -e "create table test.topt (a int auto_increment primary key);"
+
+# take a backup with stream mode
+mkdir -p $topdir/backup
+innobackupex --stream=xbstream $topdir/backup > $topdir/backup/stream.xbs
+
+# will fail if table topt backed up twice
+xbstream -xv -C $topdir/backup < $topdir/backup/stream.xbs