percona-xtrabackup-2.1.3版

innobackupex-2.1.3.diff

--- innobackupex.orig   2013-05-23 03:50:09.000000000 +0900
+++ innobackupex        2013-06-19 19:15:00.000000000 +0900
@@ -1593,10 +1593,19 @@
     print FILE  "CHANGE MASTER TO MASTER_LOG_FILE='$filename', MASTER_LOG_POS=$position\n";
     close(FILE);
 
+    my $orig_datadir = get_option(\%config, 'mysqld', 'datadir');
+
     if ($option_stream) {
+        system("cd $orig_datadir; $stream_cmd master.info")
+            and Die "Failed to stream 'master.info': $!";
         stream_encrypt_file($option_tmpdir, "xtrabackup_slave_info")
                             and Die "Failed to stream 'xtrabackup_slave_info': $!";
         unlink $slave_info || Die "Failed to delete '$slave_info': $!";
+    } else {
+        $src_name = escape_path("$orig_datadir/master.info");
+        $dst_name = escape_path("$backup_dir/");
+        system("$CP_CMD \"$src_name\" \"$dst_name\"")
+            and Die "Failed to copy file 'master.info': $!";
     }
 
     $mysql_slave_position = "master host '$master', filename '$filename', position $position";
@@ -2195,7 +2204,7 @@
     my @list;
     my $file;
     my $database;
-    my $wildcard = '*.{frm,isl,MYD,MYI,MAD,MAI,MRG,TRG,TRN,ARM,ARZ,CSM,CSV,opt,par}';
+    my $wildcard = '*.{frm,isl,MYD,MYI,MAD,MAI,MRG,TRG,TRN,ARM,ARZ,CSM,CSV,opt,par,SEN.*}';
     my $rsync_file_list;
     my $operation;
     my $rsync_tmpfile_pass1 = "$option_tmpdir/xtrabackup_rsyncfiles_pass1";
@@ -2248,7 +2257,7 @@
 
         # copy files of this database
        opendir(DBDIR, "$source_dir/$database");
-       @list = grep(/\.(frm|isl|MYD|MYI|MAD|MAI|MRG|TRG|TRN|ARM|ARZ|CSM|CSV|opt|par)$/, readdir(DBDIR));
+       @list = grep(/\.(frm|isl|MYD|MYI|MAD|MAI|MRG|TRG|TRN|ARM|ARZ|CSM|CSV|opt|par|SEN.*)$/, readdir(DBDIR));
        closedir DBDIR;
         $file_c = @list;
         if ($file_c <= $backup_file_print_limit) {