bzr push into mysql-6.0-backup branch (hema:2702) WL#4568

[Hema Sridharan]

 2702 Hema Sridharan	2008-10-08
      Changed the expected warning messages for backup tests in mtr_report.pl from 
      mail.backup* tests to backup.backup* as all tests are moved from main to 
      backup suite.(WL#4568)
modified:
  mysql-test/lib/mtr_report.pl

=== modified file 'mysql-test/lib/mtr_report.pl'
--- a/mysql-test/lib/mtr_report.pl	2008-09-29 18:41:59 +0000
+++ b/mysql-test/lib/mtr_report.pl	2008-10-08 15:16:08 +0000
@@ -329,43 +329,43 @@ sub mtr_report_stats ($) {
                 /Slave SQL:.*(?:Error_code: \d+|Query:.*)/ or
 		
 		# backup_errors test is supposed to trigger lots of backup related errors
-		($testname eq 'main.backup_errors') and
+		($testname eq 'backup.backup_errors') and
 		(
 		  /Backup:/ or /Restore:/ or /Can't open the backup logs as tables/
 		) or
 
 		# backup_backupdir test is supposed to trigger backup related errors
-		($testname eq 'main.backup_backupdir') and
+		($testname eq 'backup.backup_backupdir') and
 		(
 		  /Backup:/ or /Can't write to backup location/
 		) or
                 
 		# backup_concurrent performs a backup that should fail
-		($testname eq 'main.backup_concurrent') and
+		($testname eq 'backup.backup_concurrent') and
 		(
 		  /Can't execute this command because another BACKUP\/RESTORE operation is in progress/
 		) or
                 
 		# backup_db_grants test is supposed to trigger lots of restore warnings
-		($testname eq 'main.backup_db_grants') and
+		($testname eq 'backup.backup_db_grants') and
 		(
 		  /Restore:/ or /was skipped because the user does not exist/
 		) or
                 
 		# The tablespace test triggers error below on purpose
-		($testname eq 'main.backup_tablespace') and
+		($testname eq 'backup.backup_tablespace') and
 		(
 		  /Restore: Tablespace .* needed by tables being restored has changed on the server/
 		) or
                 
 		# The backup_securefilepriv test triggers error below on purpose
-		($testname eq 'main.backup_securefilepriv') and
+		($testname eq 'backup.backup_securefilepriv') and
 		(
 		  /Backup: The MySQL server is running with the /
 		) or
 		
 		# The views test triggers errors below on purpose
-		($testname eq 'main.backup_views') and
+		($testname eq 'backup.backup_views') and
 		(
 		  /Backup: Failed to add view/ or
 		  /Backup: Failed to obtain meta-data for view/ or
@@ -373,11 +373,11 @@ sub mtr_report_stats ($) {
 		) or
  	 
 		# ignore warning generated when backup engine selection algorithm is tested
-		($testname eq 'main.backup_no_be') and /Backup: Cannot create backup engine/ or
+		($testname eq 'backup.backup_no_be') and /Backup: Cannot create backup engine/ or
 		# ignore warnings generated when backup privilege is tested
-		($testname eq 'main.backup_security') and /(Backup|Restore): Access denied; you need
the SUPER/ or
+		($testname eq 'backup.backup_security') and /(Backup|Restore): Access denied; you need
the SUPER/ or
 		
-                ($testname eq 'main.backup_myisam1') and
+                ($testname eq 'backup.backup_myisam1') and
                 (/Backup: Can't initialize MyISAM backup driver/) or
 		/Sort aborted/ or
 		/Time-out in NDB/ or