From: Marc Alff
Date: August 26 2010 4:47pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3253)
List-Archive: http://lists.mysql.com/commits/116921
Message-Id: <20100826164730.7D12445E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4209076934110103488=="

--===============4209076934110103488==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-55658/ based on revid:marc.alff@stripped

 3253 Marc Alff	2010-08-26 [merge]
      local merge

    modified:
      sql/table.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;
 }
 


--===============4209076934110103488==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   55658/
# testament_sha1: aafdb87f6b48c08292e1ef30998722445c1e53f1
# timestamp: 2010-08-26 10:47:30 -0600
# base_revision_id: marc.alff@stripped\
#   tfl1hqpm3o6l9sjv
# 
# Begin bundle
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


--===============4209076934110103488==--