MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Rafal Somla Date:September 16 2008 8:33am
Subject:bzr commit into mysql-6.0-backup branch (Rafal.Somla:2693) Bug#33174
View as plain text  
#At file:///ext/mysql/bzr/backup/bug33174/

 2693 Rafal Somla	2008-09-16
      BUG#33174 (Backup: Numeric error values inside backup test scripts)
      
      Before: Some backup tests used numeric error values in "--error" directives.
      
      After: Always a symbolic error constant is used.
modified:
  mysql-test/t/backup_ddl_blocker.test
  mysql-test/t/backup_fkey.test
  mysql-test/t/backup_security.test

=== modified file 'mysql-test/t/backup_ddl_blocker.test'
--- a/mysql-test/t/backup_ddl_blocker.test	2008-06-25 13:39:04 +0000
+++ b/mysql-test/t/backup_ddl_blocker.test	2008-09-16 08:33:21 +0000
@@ -251,7 +251,7 @@ RESTORE FROM "bup_ddl_blocker.bak";
 --echo con1: Table t4 should not have new column in restored data.
 DESCRIBE bup_ddl_blocker.t1;
 DESCRIBE bup_ddl_blocker.t2;
---error 1146
+--error ER_NO_SUCH_TABLE
 DESCRIBE bup_ddl_blocker.t3;
 DESCRIBE bup_ddl_blocker.t4;
 
@@ -379,7 +379,7 @@ reap;
 --echo con1: Table t2 should not have new column in restored data.
 --echo con1: Table t3 should be in restored data.
 --echo con1: Table t4 should have new column in restored data.
---error 1146
+--error ER_NO_SUCH_TABLE
 DESCRIBE bup_ddl_blocker.t1;
 DESCRIBE bup_ddl_blocker.t2;
 DESCRIBE bup_ddl_blocker.t3;

=== modified file 'mysql-test/t/backup_fkey.test'
--- a/mysql-test/t/backup_fkey.test	2007-12-13 16:50:01 +0000
+++ b/mysql-test/t/backup_fkey.test	2008-09-16 08:33:21 +0000
@@ -49,7 +49,7 @@ INSERT INTO backup_fkey.child VALUES (2,
 INSERT INTO backup_fkey.child VALUES (3, 2);
 
 # Show that foreign key constraints are enforced.
---error 1452
+--error ER_NO_REFERENCED_ROW_2
 INSERT INTO backup_fkey.child VALUES (4, 6);
 
 # Backup the database with fkey constraints preserved.

=== modified file 'mysql-test/t/backup_security.test'
--- a/mysql-test/t/backup_security.test	2008-06-25 13:39:04 +0000
+++ b/mysql-test/t/backup_security.test	2008-09-16 08:33:21 +0000
@@ -49,13 +49,13 @@ connect (no_rights,localhost,bup_no_righ
 
 --echo no_rights: Attempting backup. Should fail with error 1227
 --replace_column 1 #
---error 1227
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
 BACKUP DATABASE backup_test to 'bup_no_rights.bak';
 SHOW ERRORS;
 
 --echo no_rights: Attempting restore. Should fail with error 1227
 --replace_column 1 #
---error 1227
+--error ER_SPECIFIC_ACCESS_DENIED_ERROR
 RESTORE FROM 'bup_no_rights.bak';
 SHOW ERRORS;
 

Thread
bzr commit into mysql-6.0-backup branch (Rafal.Somla:2693) Bug#33174Rafal Somla16 Sep