bzr commit into mysql-6.0-backup branch (jorgen.loland:2746) Bug#41294

[Jorgen Loland]

#At file:///localhome/jl208045/mysql/mysql-6.0-backup-41294/

 2746 Jorgen Loland	2009-01-06
      Bug#41294 - Object services do not clean error reporting context.
      
      Backup kernel uses the object services (si_objects) to read objects metadata and
create objects from the metadata. The old si_objects did not clean the error reporting
context, which could cause ASSERTS.
      
      si_objects has since been completely refactored, and the ASSERT is no longer
reproducible. This patch therefore removes the cleanup code from kernel.cc. If the ASSERT
is encountered later, a fix should be implemented in si_objects.[cc|h], not in kernel.cc
modified:
  sql/backup/kernel.cc

per-file messages:
  sql/backup/kernel.cc
    Remove temporary fix needed because the old si_objects did not clean up error
reporting context.
=== modified file 'sql/backup/kernel.cc'
--- a/sql/backup/kernel.cc	2008-12-18 21:46:36 +0000
+++ b/sql/backup/kernel.cc	2009-01-06 13:21:09 +0000
@@ -1247,15 +1247,6 @@ int Backup_restore_ctx::do_restore(bool 
 
   DBUG_PRINT("restore",("Restoring table data"));
 
-  /* 
-    FIXME: this call is here because object services doesn't clean the
-    statement execution context properly, which leads to assertion failure.
-    It should be fixed inside object services implementation and then the
-    following line should be removed.
-   */
-  close_thread_tables(m_thd);                   // Never errors
-  m_thd->main_da.reset_diagnostics_area();      // Never errors  
-
   err= lock_tables_for_restore();               // logs errors
   if (err)
     DBUG_RETURN(fatal_error(err));