From: Jon Olav Hauglid
Date: August 26 2010 3:39pm
Subject: bzr push into mysql-next-mr-bugfixing branch (jon.hauglid:3251 to 3252)
List-Archive: http://lists.mysql.com/commits/116918
Message-Id: <201008261541.o7QEfHRp018490@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5757718955463531012=="

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

 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;
 }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-next-mr-bugfixing-test/
# testament_sha1: 62bcf4fdf78211a8d7532039cebfa4daaf122777
# timestamp: 2010-08-26 17:39:57 +0200
# source_branch: file:///export/home/x/mysql-trunk-bugfixing-test/
# base_revision_id: marc.alff@stripped\
#   2fv9l7zd02wgf13g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZGroKcAA2JfgEAQWeP//393
3QC////wYAc/eNgAAFAAAAADSTKehMmQ0A2p6mgAAAAAGQc0ZMTABMRgRpgQYjBMmARhzRkxMAEx
GBGmBBiMEyYBGDU9TTUyJP1Gmp6Rp6jJo0YE0YgDTQyaaBzRkxMAExGBGmBBiMEyYBGCSJMgJgIy
Ap6DRNCmGmSbE1D0mmaj/DKw+LY8ihjX66HvN5vI67fHnXMHGTyeatkpuLqLJWHvmPMoNFeWuo8a
HWhSQob9T8SWx5QVoaQSz49gNqOCsLLJqBpe1igkicRjuHANVNUrnQZ+8qJsaKHbvmR8gQOhsUIi
mHJBUM3R10VVlnJqEFkQJFhIj4OAR8sUAOtJFF47rrHoHge0toTDSiCwoKEqGBecEhDAIOQxBT3L
ewzjtlV7U9rtcHMBYLctOmLDsziNTeeHgLxgMqDvHDI3nQNSSgPzps5NiLUAJXAjUpeyLu8/Lt2h
QitiZhmHb1DYGgQAUQSiDo5DbEwZRU9ROgVEXwDyiLSlH2Mx/7oHKI8BDbLwmwcJMzV29ioEvy7O
HEM9OpQG6wiSMyolTpKe6s3aK3UTWL+S0hdMkGBVNWOItN9leuZR+QNhAqCRUX4YF21wzqzrgnGN
gCcqN9LqQ9WotScSJu7hgUDEScjjujnYJ0p+8IPVneqtuJWrt9QppgseApi+tTCLI2D8do5MTqqf
hPE4MWKovOoYC2XiLi3bTcMKaYzIbTcrVPqQykoVKuNTGdkj0oCsDeGtkvuG0izVf0cRFIcSYZdM
RE2+a3Cp0jQ/PSC6i5bhQFo5/ZfpMpzsfdrDgE/RW2HWsr6ZbqU4cMZp5lRzHNVp02a0mgkWdKIy
8xEOFD13jbicpK95Mh4d+EMTMpusB3Cg/IgxuThtdiknNq7HAjLARhljAoWl2ZB2IQJyQsZp/WvS
SwwJSsH2ZlgwkSLp3JpRnnGxkQvIFJQTLOF5PXsL8VcXFJRTwpMxFZeU4XwTBQQobWwzIsqYg6OG
eb2oeceWQa7aI0F1+w1VtBWL8Y0kGJyuYtGnEUCtIBM1BATFA0gklKgY934BxOJgVGWrMiByPieR
2iaJhDJgP/L9/qH1quZMMDH7rhwxtm+p/Kos/r7EiMmyNIYnBcI3R9IMnl3fKcgpAGSjaJJ22QFB
YgIDkfP85yJEGGCBGh0HNj2P4d54+Z+fn7PlMrRH0+ghbLLbyoJmxJJfMX4+H6e9ValppSNkwtgX
iPkFFN6JSGJDFPtJgR+h2/Bb/jzPjMfCPMlIbEmi+CgdICP1PYR/RJjvXkg0FvFA1ssshdTSx0Fx
y+ZlWHPgSH67XGEKHMKhC2ll0dwvCFJS/FlLHI/gh2W28lltzPpqXEipEqROXREKRK0m0m5+U27d
VqD1mg8kdcmPVqZQR06XQxIBIQGHbc+3wgTNyqsJeIfLjOcreZYd0DkDveWJMG0MsoA2fnRNi8xt
JF+fq7+8z13QKzfs+g/Uo5bijxdZ/wOGIVbTYG6P7yDjiJxMYcqDw/qflAY8P99iJOwxSw1YHbUm
FEkXU8w26dyz5d5Qdju8H6V9CcTyjbMHU5igG8/k8DRYJeIiscWsyw3uvMYoZxtFI9bIYYPNQn2o
PWpJYCvUYCRkTGgVFyrII9ghuqO4C53DqegIb5MDMZT9+MY7UMUDLcXiMurYkC8+AnBDk544+twj
uFEIqk9ErdsWm09IItJUfr1NSYqMwJGRUBVoXASL5qj6H+hnQw4z7D7COOAMacRdFaePFK0+wHMD
ACB5QPRML+yqkiLYITg4RCdzsK0THuEdBI6QXQasagr+9a/AQmDkIc9VU3dDiJ0W1lkYmAX6FhYe
ZPSUBWUFwUClFhmqpDYw7AKdewQ4RKlHYyCeJOQEmKyIT5ECMQnSHGEwqPcFniHz92AYnirCAmPX
c5mCX3OHS8OAIYXvJ1evuIWCTpfi4u3DZjQxYK7kMMJiYJgeR4HvVfORIoOxsFsLAKDzDnsObPWb
RDhBAHiRE7B425jL4TCLzeTBSGHeZVixKT1GJmWlMCFIVFMEOOLjM01MYDu00wtpsiRRdUd7sycV
ZUA5SdGGYn9p7Rik3irSprSfFh/ioBTc2DQPA9sCBALCwLwoIyJFfWJALzKkYXAYR5FJb3GAVTVz
hBLYL/AmHIVpzqFMRZlAuRqXf56syVokclhzLGYLaYkj0CS6+SvFSVbwMRctoTh3L294t23015iZ
Kzy0TgMGmuI2WVcwViJBkKQaVqxWFa8w/+LuSKcKEhI1dBTg


--===============5757718955463531012==--