bzr push into mysql-6.0 branch (jorgen.loland:2631) Bug#34758

[Jorgen Loland]

 2631 Jorgen Loland	2008-06-05
      Bug#34758 - "Server crashes if database with views backed up using CS driver"
      
      Test fix followup.
      
      The backup_id in the test result file does not always match the actual number. Replacing the backup_id with '#' to make test pass
modified:
  mysql-test/r/backup_view_on_view.result
  mysql-test/t/backup_view_on_view.test

=== modified file 'mysql-test/r/backup_view_on_view.result'
--- a/mysql-test/r/backup_view_on_view.result	2008-06-04 14:41:39 +0000
+++ b/mysql-test/r/backup_view_on_view.result	2008-06-05 12:38:10 +0000
@@ -7,10 +7,10 @@ CREATE VIEW db1.v2 AS SELECT * FROM db1.
 INSERT INTO db1.t1 VALUES (1),(2),(3),(5),(7),(11);
 BACKUP DATABASE db1 TO 'test.bak';
 backup_id
-1
+#
 RESTORE FROM 'test.bak';
 backup_id
-2
+#
 SELECT * FROM db1.v2;
 a
 1

=== modified file 'mysql-test/t/backup_view_on_view.test'
--- a/mysql-test/t/backup_view_on_view.test	2008-06-04 14:41:39 +0000
+++ b/mysql-test/t/backup_view_on_view.test	2008-06-05 12:38:10 +0000
@@ -17,7 +17,9 @@ CREATE VIEW db1.v2 AS SELECT * FROM db1.
 
 INSERT INTO db1.t1 VALUES (1),(2),(3),(5),(7),(11);
 
+replace_column 1 #;
 BACKUP DATABASE db1 TO 'test.bak';
+replace_column 1 #;
 RESTORE FROM 'test.bak';
 
 SELECT * FROM db1.v2;