From: Date: November 3 2008 9:47am
Subject: bzr commit into mysql-6.0-rpl branch (zhenxing.he:2720) Bug#39714
List-Archive: http://lists.mysql.com/commits/57666
X-Bug: 39714
Message-Id: <200811030847.mA38lFUe000819@mail.hezx.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///media/sda3/work/mysql/bzrwork/merge/6.0-rpl/

 2720 He Zhenxing	2008-11-03 [merge]
      Merge BUG#39714
modified:
  mysql-test/suite/backup/r/backup_logs.result
  mysql-test/suite/backup/t/backup_logs.test

=== modified file 'mysql-test/suite/backup/r/backup_logs.result'
--- a/mysql-test/suite/backup/r/backup_logs.result	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup/r/backup_logs.result	2008-11-03 08:46:24 +0000
@@ -188,7 +188,7 @@ SET SESSION debug="d,set_backup_id";
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 backup_id
 500
-SET SESSION debug="d";
+SET SESSION debug="";
 The backup id for this command should be 501.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 backup_id

=== modified file 'mysql-test/suite/backup/t/backup_logs.test'
--- a/mysql-test/suite/backup/t/backup_logs.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup/t/backup_logs.test	2008-11-03 08:46:24 +0000
@@ -208,7 +208,7 @@ SET SESSION debug="d,set_backup_id";
 #--replace_column 1 #
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 
-SET SESSION debug="d";
+SET SESSION debug="";
 
 --remove_file $MYSQLD_BACKUPDIR/backup_logs_orig.bak
 --echo The backup id for this command should be 501.