bzr push into mysql-6.0 branch (jorgen.loland:2633) Bug#37353

[Jorgen Loland]

 2633 Jorgen Loland	2008-06-12
      Bug#37353 "The test backup_views produces session specific data in the results"
      
      Fix - remove session specific results by adding replace_column in the test file.
modified:
  mysql-test/r/backup_views.result
  mysql-test/t/backup_views.test

=== modified file 'mysql-test/r/backup_views.result'
--- a/mysql-test/r/backup_views.result	2008-06-09 13:54:06 +0000
+++ b/mysql-test/r/backup_views.result	2008-06-12 09:55:35 +0000
@@ -214,19 +214,19 @@ collation_connection	latin1_swedish_ci
 backup data
 BACKUP DATABASE bup_db1, bup_db2 TO 'bup_objectview.bak';
 backup_id
-1
+#
 BACKUP DATABASE bup_db1 TO 'bup_objectview1.bak';
 backup_id
-2
+#
 BACKUP DATABASE bup_db2 TO 'bup_objectview2.bak';
 backup_id
-3
+#
 dropping  database.
 DROP DATABASE bup_db1;
 DROP DATABASE bup_db2;
 RESTORE FROM 'bup_objectview.bak';
 backup_id
-4
+#
 showing objects and create statements
 SHOW CREATE DATABASE bup_db1;;
 Database	bup_db1
@@ -368,7 +368,7 @@ DROP DATABASE bup_db2;
 Restoring Database
 RESTORE FROM 'bup_objectview.bak';
 backup_id
-5
+#
 USE bup_db1;
 ALTER TABLE t1 CHANGE id id tinyint not null;
 SHOW CREATE TABLE t1;;
@@ -420,12 +420,12 @@ aa6	30	Doctor
 aa8	27	undergrad
 BACKUP DATABASE bup_db1, bup_db2 TO 'bup_objectview3.bak';
 backup_id
-6
+#
 DROP DATABASE bup_db1;
 DROP DATABASE bup_db2;
 RESTORE FROM 'bup_objectview3.bak';
 backup_id
-7
+#
 USE bup_db2;
 SELECT * FROM v3;
 name	age	education

=== modified file 'mysql-test/t/backup_views.test'
--- a/mysql-test/t/backup_views.test	2008-06-09 13:54:06 +0000
+++ b/mysql-test/t/backup_views.test	2008-06-12 09:55:35 +0000
@@ -171,11 +171,13 @@ SELECT * FROM student_details; #view v4 
 
 #Backup and restore data.
 --echo backup data
-
+replace_column 1 #;
 BACKUP DATABASE bup_db1, bup_db2 TO 'bup_objectview.bak';
 
+replace_column 1 #;
 BACKUP DATABASE bup_db1 TO 'bup_objectview1.bak';
 
+replace_column 1 #;
 BACKUP DATABASE bup_db2 TO 'bup_objectview2.bak';
 
 --echo dropping  database.
@@ -192,6 +194,7 @@ DROP DATABASE bup_db2;
 #--error 1146
 #RESTORE FROM 'bup_objectview2.bak';
 
+replace_column 1 #;
 RESTORE FROM 'bup_objectview.bak';
 
 #show data and create statements
@@ -237,6 +240,7 @@ DROP DATABASE bup_db2;
 
 --echo Restoring Database
 
+replace_column 1 #;
 RESTORE FROM 'bup_objectview.bak';
 
 USE bup_db1;
@@ -262,11 +266,13 @@ SELECT * FROM v3;
 #SELECT * FROM t2;
 #SELECT * FROM v3;
 
+replace_column 1 #;
 BACKUP DATABASE bup_db1, bup_db2 TO 'bup_objectview3.bak';
 
 DROP DATABASE bup_db1;
 DROP DATABASE bup_db2;
 
+replace_column 1 #;
 RESTORE FROM 'bup_objectview3.bak';
 
 USE bup_db2;