List:Commits« Previous MessageNext Message »
From:Hema Sridharan Date:January 8 2010 2:17am
Subject:bzr push into mysql-6.0-backup branch (hema:2929 to 2930) Bug#50162
View as plain text  
 2930 Hema Sridharan	2010-01-08
      Bug#50162 
      This patch masks the errors in SHOW ERRORS statement
      modified:
        mysql-test/suite/backup/r/backup_security_var.result
        mysql-test/suite/backup/t/backup_security_var.test

 2929 Chuck Bell	2010-01-07
      BUG#50154 : BACKPORT: The test backup_db_grants contains 
                            unmasked error numbers.
      
      The warnings generated on restore are not masked which
      will cause problems when the test is run on a system
      with different error numbers (like the porting tree).
      
      This patch masks the warning numbers on restore.
      modified:
        mysql-test/suite/backup/r/backup_db_grants.result
        mysql-test/suite/backup/t/backup_db_grants.test

=== modified file 'mysql-test/suite/backup/r/backup_security_var.result'
--- a/mysql-test/suite/backup/r/backup_security_var.result	2009-12-01 01:49:23 +0000
+++ b/mysql-test/suite/backup/r/backup_security_var.result	2010-01-08 02:16:45 +0000
@@ -261,7 +261,7 @@ RESTORE FROM 'backup_test_orig_alt1.bak'
 ERROR HY000: Insufficient privileges. You must have the RESTORE privilege to restore database 'backup_test_alt'.
 SHOW ERRORS;
 Level	Code	Message
-Error	1794	Insufficient privileges. You must have the RESTORE privilege to restore database 'backup_test_alt'.
+Error	#	Insufficient privileges. You must have the RESTORE privilege to restore database 'backup_test_alt'.
 #
 # conn_some_priv: Attempting restore. Should fail with
 # error ER_RESTORE_ACCESS_DENIED_ERROR
@@ -270,7 +270,7 @@ RESTORE FROM 'backup_test_orig_alt2.bak'
 ERROR HY000: Insufficient privileges. You must have the RESTORE privilege to restore database 'backup_test_alt'.
 SHOW ERRORS;
 Level	Code	Message
-Error	1794	Insufficient privileges. You must have the RESTORE privilege to restore database 'backup_test_alt'.
+Error	#	Insufficient privileges. You must have the RESTORE privilege to restore database 'backup_test_alt'.
 #
 # Change privileges for elevated restore test case.
 #

=== modified file 'mysql-test/suite/backup/t/backup_security_var.test'
--- a/mysql-test/suite/backup/t/backup_security_var.test	2009-12-01 01:49:23 +0000
+++ b/mysql-test/suite/backup/t/backup_security_var.test	2010-01-08 02:16:45 +0000
@@ -285,6 +285,7 @@ connect (conn_some_priv,localhost,bup_so
 --replace_column 1 #
 --error ER_RESTORE_ACCESS_DENIED_ERROR
 RESTORE FROM 'backup_test_orig_alt1.bak' OVERWRITE;
+--replace_column 2 #
 SHOW ERRORS;
 
 --echo #
@@ -294,6 +295,7 @@ SHOW ERRORS;
 --replace_column 1 #
 --error ER_RESTORE_ACCESS_DENIED_ERROR
 RESTORE FROM 'backup_test_orig_alt2.bak' OVERWRITE;
+--replace_column 2 #
 SHOW ERRORS;
 
 disconnect conn_some_priv;

Thread
bzr push into mysql-6.0-backup branch (hema:2929 to 2930) Bug#50162Hema Sridharan8 Jan