bzr push into mysql-next-mr-bugfixing branch (jon.hauglid:3251 to 3252)

[Jon Olav Hauglid]

 3252 Jon Olav Hauglid	2010-08-26 [merge]
      Merge from mysql-trunk-bugfixing to mysql-next-mr-bugfixing.

    modified:
      sql/table.cc
 3251 Marc Alff	2010-08-26 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    added:
      mysql-test/suite/perfschema/r/bad_option_3.result
      mysql-test/suite/perfschema/r/bad_option_4.result
      mysql-test/suite/perfschema/r/bad_option_5.result
      mysql-test/suite/perfschema/r/short_option_1.result
      mysql-test/suite/perfschema/r/short_option_2.result
      mysql-test/suite/perfschema/t/bad_option_3.test
      mysql-test/suite/perfschema/t/bad_option_4.test
      mysql-test/suite/perfschema/t/bad_option_5.test
      mysql-test/suite/perfschema/t/short_option_1-master.opt
      mysql-test/suite/perfschema/t/short_option_1.test
      mysql-test/suite/perfschema/t/short_option_2-master.opt
      mysql-test/suite/perfschema/t/short_option_2.test
    modified:
      mysys/my_getopt.c
      sql/set_var.cc
=== modified file 'sql/table.cc'
--- a/sql/table.cc	2010-08-20 09:15:16 +0000
+++ b/sql/table.cc	2010-08-26 15:32:53 +0000
@@ -426,6 +426,12 @@ void TABLE_SHARE::destroy()
       info_it->flags= 0;
     }
   }
+
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(PSI_server && m_psi))
+    PSI_server->release_table_share(m_psi);
+#endif
+
   /*
     Make a copy since the share is allocated in its own root,
     and free_root() updates its argument after freeing the memory.
@@ -477,12 +483,6 @@ void free_table_share(TABLE_SHARE *share
       for this thread to do the work.
     */
   }
-
-#ifdef HAVE_PSI_INTERFACE
-  if (likely(PSI_server && share->m_psi))
-    PSI_server->release_table_share(share->m_psi);
-#endif
-
   DBUG_VOID_RETURN;
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]