bzr commit into mysql-6.0-backup branch (cbell:2683) Bug#39017

[Chuck Bell]

#At file:///D:/source/bzr/mysql-6.0-backup-test/

 2683 Chuck Bell	2008-08-26
      Disabled another portion of the test for BUG#39017.
modified:
  mysql-test/r/backup_default.result
  mysql-test/t/backup_default.test

=== modified file 'mysql-test/r/backup_default.result'
--- a/mysql-test/r/backup_default.result	2008-08-25 18:14:40 +0000
+++ b/mysql-test/r/backup_default.result	2008-08-26 13:28:34 +0000
@@ -67,33 +67,6 @@ i int,
 v varchar(20))
 ENGINE=myisam;
 INSERT INTO myisam_table VALUES(1,'v1'),(2,'v2'),(3,'v3');
-backup on mixed table database
-BACKUP DATABASE db1 to 'bup_mixed.bak';
-backup_id
-#
-DROP DATABASE db1;
-restore on mixed table database
-RESTORE FROM 'bup_mixed.bak';
-backup_id
-#
-testing content in restored tables
-SELECT * FROM partition_table ORDER BY int_column;
-int_column	char_column
-0	pVtIa
-5	jTfSg
-20	UezFi
-25	cxmeH
-65	lIuNS
-SELECT * FROM csv_table ORDER BY id;
-id	name	city
-1	aa1	bb1
-2	aa2	bb2
-3	aa3	bb3
-SELECT * FROM myisam_table ORDER BY i;
-i	v
-1	v1
-2	v2
-3	v3
 
 ***  CLEANUP  ****
 

=== modified file 'mysql-test/t/backup_default.test'
--- a/mysql-test/t/backup_default.test	2008-08-25 18:14:40 +0000
+++ b/mysql-test/t/backup_default.test	2008-08-26 13:28:34 +0000
@@ -102,20 +102,23 @@ ENGINE=myisam;
 
 INSERT INTO myisam_table VALUES(1,'v1'),(2,'v2'),(3,'v3');
 
---echo backup on mixed table database
---replace_column 1 #
-BACKUP DATABASE db1 to 'bup_mixed.bak';
-
-DROP DATABASE db1;
-
---echo restore on mixed table database
---replace_column 1 #
-RESTORE FROM 'bup_mixed.bak';
-
---echo testing content in restored tables
-SELECT * FROM partition_table ORDER BY int_column;
-SELECT * FROM csv_table ORDER BY id;
-SELECT * FROM myisam_table ORDER BY i;
+#
+# This portion of the test has been disabled. See BUG#39017
+#
+#--echo backup on mixed table database
+#--replace_column 1 #
+#BACKUP DATABASE db1 to 'bup_mixed.bak';
+#
+#DROP DATABASE db1;
+#
+#--echo restore on mixed table database
+#--replace_column 1 #
+#RESTORE FROM 'bup_mixed.bak';
+#
+#--echo testing content in restored tables
+#SELECT * FROM partition_table ORDER BY int_column;
+#SELECT * FROM csv_table ORDER BY id;
+#SELECT * FROM myisam_table ORDER BY i;
 
 
 # Test cleanup section
@@ -129,5 +132,5 @@ DROP DATABASE db1;
 
 --remove_file $MYSQLTEST_VARDIR/master-data/bup_csv.bak
 #--remove_file $MYSQLTEST_VARDIR/master-data/bup_falcon.bak
---remove_file $MYSQLTEST_VARDIR/master-data/bup_mixed.bak
+#--remove_file $MYSQLTEST_VARDIR/master-data/bup_mixed.bak