bzr push into mysql-6.0-backup branch (jorgen.loland:2737 to 2738) Bug#38426

[Jorgen Loland]

 2738 Jorgen Loland	2008-12-04
      Bug#38426 - Backup of partitioned Falcon table will not use snapshot driver
      
      Followup patch - compile partition-specific parts of backup code only if partitioning is included in the server
modified:
  mysql-test/suite/backup_engines/t/backup_partition.test
  sql/backup/backup_info.cc

 2737 Jorgen Loland	2008-12-04
      Bug#38426 - Backup of partitioned Falcon table will not use snapshot driver
                  
      Before, the Default backup driver was used when backing up a partitioned table. However, the Snapshot driver is capable of backing up partitioned tables if the underlying storage engine is InnoDB or Falcon.
            
      With this patch, the Snapshot backup driver is used if the underlying storage engine of a partitioned table is InnoDB or Falcon
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/suite/backup_engines/t/backup_partition.test'
--- a/mysql-test/suite/backup_engines/t/backup_partition.test	2008-12-04 13:04:16 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_partition.test	2008-12-04 15:25:48 +0000
@@ -8,6 +8,8 @@
 #   All other partitioned tables  -> Default
 #
 
+--source include/have_partition.inc
+
 # Find expected backup driver for the current storage engine.
 
 let $exp_drv= Default;

=== modified file 'sql/backup/backup_info.cc'
--- a/sql/backup/backup_info.cc	2008-12-04 13:04:16 +0000
+++ b/sql/backup/backup_info.cc	2008-12-04 15:25:48 +0000
@@ -36,6 +36,7 @@ storage_engine_ref get_storage_engine(TH
   {
     se= plugin_ref_to_se_ref(table->s->db_plugin);
 
+#ifdef WITH_PARTITION_STORAGE_ENGINE
     /*
       Further check for underlying storage engine is needed
       if table is partitioned
@@ -74,6 +75,7 @@ storage_engine_ref get_storage_engine(TH
       
       se= se_tmp;
     }
+#endif
 
  close: