bzr push into mysql-6.0-opt branch (sergefp:2825 to 2826)

[Sergey Petrunia]

 2826 Sergey Petrunia	2009-02-01
      Update test results (MTR2)
modified:
  mysql-test/suite/rpl/r/rpl_backup.result

 2825 Sergey Petrunia	2009-02-01
      Fix PB failures: Update tests to work with MTR2. The test update is probably incomplete
modified:
  mysql-test/suite/backup/r/backup_datatypes.result
  mysql-test/suite/backup/r/backup_errors.result
  mysql-test/suite/backup/t/backup.test
  mysql-test/suite/backup/t/backup_datatypes.test
  mysql-test/suite/backup/t/backup_errors.test
  mysql-test/suite/backup/t/backup_logs.test
  mysql-test/suite/backup/t/backup_myisam_coverage.test

=== modified file 'mysql-test/suite/rpl/r/rpl_backup.result'
--- a/mysql-test/suite/rpl/r/rpl_backup.result	2009-01-29 21:17:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup.result	2009-02-01 19:17:09 +0000
@@ -384,6 +384,8 @@ Last_IO_Errno	0
 Last_IO_Error	
 Last_SQL_Errno	0
 Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 Restore is now complete.
 backup_id
 #
@@ -392,6 +394,7 @@ SET DEBUG_SYNC = 'now WAIT_FOR done';
 SHOW DATABASES;
 Database
 information_schema
+mtr
 mysql
 rpl_backup
 test
@@ -437,6 +440,8 @@ Last_IO_Errno	0
 Last_IO_Error	
 Last_SQL_Errno	0
 Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 Now stop the slave.
 SLAVE STOP;
 FLUSH BACKUP LOGS;