bzr push into mysql-6.0-backup branch (rsomla:2643 to 2644)

[Rafal Somla]

 2644 Rafal Somla	2008-07-01 [merge]
      Merging local changes with the team tree.
modified:
  mysql-test/t/disabled.def
  sql/backup/backup_info.cc
  sql/backup/kernel.cc

 2643 Sergey Vojtovich	2008-07-01 [merge]
      Auto merged.
modified:
  sql/backup/stream.cc

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-06-25 13:39:04 +0000
+++ b/mysql-test/t/disabled.def	2008-07-01 13:34:36 +0000
@@ -37,3 +37,5 @@ sort_buffer_size_basic_32   : Bug#36875 
 key_buffer_size_basic_32    : Bug#36876 main.key_buffer_size_basic_32 fails on some systems
 max_heap_table_size_basic_32 : Bug#36877 main.max_heap_table_size_basic_32 fails on some systems
 tmp_table_size_basic_32     : Bug#36878 main.tmp_table_size_basic_32 fails on some systems
+backup_triggers_and_events  : Bug#37762 2008-07-01 rafal Test fails on remove_file for unknown reasons
+backup_tablespace           : Bug#36973 2008-07-01 rafal

=== modified file 'sql/backup/backup_info.cc'
--- a/sql/backup/backup_info.cc	2008-05-28 15:25:24 +0000
+++ b/sql/backup/backup_info.cc	2008-07-01 13:34:36 +0000
@@ -922,7 +922,10 @@ int Backup_info::add_view_deps(obs::Obj 
       base views.
      */ 
     if (res == get_dep_node_res::EXISTING_NODE)
+    {
+      delete bv; // Need to delete the instance returned by it->next().
       continue;
+    }
 
     // Recursively add all dependencies of bv to the list.
 

=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc	2008-06-30 19:40:33 +0000
+++ b/sql/backup/kernel.cc	2008-07-01 13:34:36 +0000
@@ -489,6 +489,7 @@ Backup_restore_ctx::prepare_for_backup(L
    */
 
   Output_stream *s= new Output_stream(*this, path, with_compression);
+  m_stream= s;
   
   if (!s)
   {
@@ -502,8 +503,6 @@ Backup_restore_ctx::prepare_for_backup(L
     return NULL;
   }
 
-  m_stream= s;
-
   /*
     Create backup catalogue.
    */
@@ -567,6 +566,7 @@ Backup_restore_ctx::prepare_for_restore(
 
   backup::String path(location);
   Input_stream *s= new Input_stream(*this, path);
+  m_stream= s;
   
   if (!s)
   {
@@ -580,8 +580,6 @@ Backup_restore_ctx::prepare_for_restore(
     return NULL;
   }
 
-  m_stream= s;
-
   /*
     Create restore catalogue.
    */