bzr push into mysql-6.0 branch (oystein.grovlen:2731 to 2732) Bug#40741

[Oystein.Grovlen]

 2732 oystein.grovlen@stripped	2008-12-08
      Bug#40741 backup.backup test fails if blackhole engine is not available
      
       - Make sure test backup.backup only runs if blackhole engine is available.
       - Fixed have_blackhole.inc to give an informative message when a test is 
         skipped because the blackhole engine is missing
       - Some clean-up to backup.backup result file to cater for changes that has 
         happened while it was disabled.
modified:
  mysql-test/include/have_blackhole.inc
  mysql-test/suite/backup/r/backup.result
  mysql-test/suite/backup/t/backup.test

 2731 Ingo Struewing	2008-12-05 [merge]
      auto-merge
added:
  mysql-test/suite/backup_engines/r/backup_partition.result
  mysql-test/suite/backup_engines/t/backup_partition.test
modified:
  mysql-test/suite/backup/r/backup_default.result
  mysql-test/suite/backup/t/backup_default.test
  sql/backup/backup_info.cc

=== modified file 'mysql-test/include/have_blackhole.inc'
--- a/mysql-test/include/have_blackhole.inc	2008-07-04 18:48:25 +0000
+++ b/mysql-test/include/have_blackhole.inc	2008-12-08 10:30:21 +0000
@@ -1,4 +1,9 @@
 disable_query_log;
 --require r/true.require
-select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'blackhole';
+let $have_blackhole=`select (support = 'YES' or support = 'DEFAULT') as `TRUE` 
+                   from information_schema.engines where engine = 'blackhole'`;
+if (!$have_blackhole)
+{
+  skip Test needs the Blackhole storage engine;
+}
 enable_query_log;

=== modified file 'mysql-test/suite/backup/r/backup.result'
--- a/mysql-test/suite/backup/r/backup.result	2008-11-26 10:05:19 +0000
+++ b/mysql-test/suite/backup/r/backup.result	2008-12-08 10:30:21 +0000
@@ -132,18 +132,13 @@ tasking	CREATE TABLE `tasking` (
   `project_number` char(9) DEFAULT NULL,
   `hours_worked` double(10,2) DEFAULT NULL
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1
-SELECT validity_point_time = @vp_time FROM mysql.backup_history
-WHERE backup_id = @bid;
-validity_point_time = @vp_time
-1
-SELECT binlog_file = @vp_file FROM mysql.backup_history
-WHERE backup_id = @bid;
-binlog_file = @vp_file
-1
-SELECT binlog_pos = @vp_pos FROM mysql.backup_history
-WHERE backup_id = @bid;
+SELECT validity_point_time = @vp_time, 
+binlog_file = @vp_file, 
 binlog_pos = @vp_pos
-1
+FROM mysql.backup_history
+WHERE backup_id = @bid;
+validity_point_time = @vp_time	binlog_file = @vp_file	binlog_pos = @vp_pos
+1	1	1
 DROP DATABASE db1;
 DROP DATABASE db2;
 DROP DATABASE db3;
@@ -164,18 +159,13 @@ RESTORE FROM 'db1.bkp';
 backup_id
 #
 SELECT MAX(backup_id) FROM mysql.backup_history INTO @bid;
-SELECT validity_point_time = @vp_time FROM mysql.backup_history
-WHERE backup_id = @bid;
-validity_point_time = @vp_time
-1
-SELECT binlog_file = @vp_file FROM mysql.backup_history
-WHERE backup_id = @bid;
-binlog_file = @vp_file
-1
-SELECT binlog_pos = @vp_pos FROM mysql.backup_history
-WHERE backup_id = @bid;
+SELECT validity_point_time = @vp_time,
+binlog_file = @vp_file,
 binlog_pos = @vp_pos
-1
+FROM mysql.backup_history
+WHERE backup_id = @bid;
+validity_point_time = @vp_time	binlog_file = @vp_file	binlog_pos = @vp_pos
+1	1	1
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS bup_default;
 CREATE DATABASE bup_default;

=== modified file 'mysql-test/suite/backup/t/backup.test'
--- a/mysql-test/suite/backup/t/backup.test	2008-11-26 10:05:19 +0000
+++ b/mysql-test/suite/backup/t/backup.test	2008-12-08 10:30:21 +0000
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/have_blackhole.inc
 --source include/not_embedded.inc
 --source include/have_debug_sync.inc
 --source include/have_log_bin.inc
@@ -180,9 +181,9 @@ SHOW CREATE TABLE tasking;
 
 # check that VP info was correctly read and reported
 
-SELECT validity_point_time = @vp_time 
-   AND binlog_file = @vp_file
-   AND binlog_pos = @vp_pos
+SELECT validity_point_time = @vp_time, 
+       binlog_file = @vp_file, 
+       binlog_pos = @vp_pos
 FROM mysql.backup_history
 WHERE backup_id = @bid; 
 
@@ -226,9 +227,9 @@ SELECT MAX(backup_id) FROM mysql.backup_
 
 # check that VP info was correctly read and reported
 
-SELECT validity_point_time = @vp_time 
-   AND binlog_file = @vp_file
-   AND binlog_pos = @vp_pos
+SELECT validity_point_time = @vp_time,
+       binlog_file = @vp_file,
+       binlog_pos = @vp_pos
 FROM mysql.backup_history
 WHERE backup_id = @bid;