bzr push into mysql-trunk branch (marc.alff:3419 to 3420)

[Marc Alff]

 3420 Marc Alff	2011-09-21
      Misc cleanup

    modified:
      sql/sql_base.cc
 3419 Marc Alff	2011-09-20
      Moved table io unbind / rebind calls outside of the LOCK_open critical section

    modified:
      sql/sql_base.cc
=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2011-09-20 17:24:16 +0000
+++ b/sql/sql_base.cc	2011-09-21 09:31:13 +0000
@@ -542,8 +542,6 @@ static void table_def_use_table(THD *thd
   DBUG_ASSERT(table->db_stat && table->file);
   /* The children must be detached from the table. */
   DBUG_ASSERT(! table->file->extra(HA_EXTRA_IS_ATTACHED_CHILDREN));
-
-  table->file->rebind_psi();
 }
 
 
@@ -3149,7 +3147,10 @@ retry_share:
 
   /* Call rebind_psi outside of the LOCK_open critical section. */
   if (recycled_free_table)
+  {
+    DBUG_ASSERT(table->file != NULL);
     table->file->rebind_psi();
+  }
 
   table->mdl_ticket= mdl_ticket;
 

No bundle (reason: useless for push emails).