--- /usr/bin/innobackupex-1.5.1	2010-07-23 01:49:00.000000000 +0800
+++ /tmp/innobackupex-1.5.1	2010-07-28 12:25:33.000000000 +0800
@@ -540,9 +540,9 @@
             and Die "Failed to stream 'xtrabackup_logfile': $!";
         unlink $tmp_logfile || Die "Failed to delete '$tmp_logfile': $!";
 
-        system("cd $orig_datadir; tar chf - xtrabackup_checkpoints")
+        system("cd $option_tmpdir; tar chf - xtrabackup_checkpoints")
             and Die "Failed to stream 'xtrabackup_checkpoints': $!";
-        unlink "$orig_datadir/xtrabackup_checkpoints" || Die "Failed to delete '$orig_datadir/xtrabackup_checkpoints': $!";
+        unlink "$option_tmpdir/xtrabackup_checkpoints" || Die "Failed to delete '$option_tmpdir/xtrabackup_checkpoints': $!";
     }
 
     print STDERR "\n$prefix Backup created in directory '$backup_dir'\n";
@@ -860,7 +860,7 @@
         $options = $options . " --target-dir=$backup_dir";
     } else {
         #(datadir) for 'xtrabackup_suspended' and 'xtrabackup_checkpoints'
-        $options = $options . " --log-stream --target-dir=./";
+        $options = $options . " --log-stream --target-dir=" . $option_tmpdir;
     }
 
     # prepare command line for running ibbackup
@@ -1533,7 +1533,8 @@
         $binlog_info = $backup_dir . '/xtrabackup_binlog_info';
         $slave_info = $backup_dir . '/xtrabackup_slave_info';
         } else {
-        $suspend_file = get_option(\%config, 'mysqld', 'datadir') . '/xtrabackup_suspended';
+        #$suspend_file = get_option(\%config, 'mysqld', 'datadir') . '/xtrabackup_suspended';
+        $suspend_file = $option_tmpdir . '/xtrabackup_suspended';
         $tmp_logfile = $option_tmpdir . '/xtrabackup_logfile';
         $mysql_stdout = $option_tmpdir . '/mysql-stdout';
         $mysql_stderr = $option_tmpdir . '/mysql-stderr';