From: Tor Didriksen
Date: September 10 2010 9:17am
Subject: bzr push into mysql-5.5-bugfixing branch (tor.didriksen:3205 to 3206)
List-Archive: http://lists.mysql.com/commits/117979
Message-Id: <20100910091747.E8E4229D0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6859408313813198800=="

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

 3206 Tor Didriksen	2010-09-10
      Header files should be self-contained

    modified:
      storage/perfschema/ha_perfschema.cc
 3205 Marc Alff	2010-09-09
      Bug#56521 Assertion failed: (m_state == 2), function allocated_to_free, pfs_lock.h (138)
      
      Before this fix, it was possible to build the server:
      - with the performance schema
      - with a dummy implementation of my_atomic (MY_ATOMIC_MODE_DUMMY).
      
      In this case, the resulting binary will just crash,
      as this configuration is not supported.
      
      This fix enforces that the build will fail with a compilation error in this
      configuration, instead of resulting in a broken binary.

    modified:
      storage/perfschema/ha_perfschema.cc
=== modified file 'storage/perfschema/ha_perfschema.cc'
--- a/storage/perfschema/ha_perfschema.cc	2010-09-09 20:28:47 +0000
+++ b/storage/perfschema/ha_perfschema.cc	2010-09-10 09:10:38 +0000
@@ -19,8 +19,8 @@
 */
 
 #include "my_global.h"
-#include "my_atomic.h"
 #include "my_pthread.h"
+#include "my_atomic.h"
 #include "sql_plugin.h"
 #include "mysql/plugin.h"
 #include "ha_perfschema.h"


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   eamj03nas42bt2e3
# target_branch: file:///export/home/didrik/repo/5.5-bugfixing-56521/
# testament_sha1: 1ef27236c7adfc4ec19845c02393e3bcdb01070f
# timestamp: 2010-09-10 11:17:47 +0200
# base_revision_id: marc.alff@stripped\
#   p2eq4vqq8v1r27ir
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQg7k+8AAX/fgAAQWGP/91ZA
BAC////wUANae6q5xrpdsuEkiBGaRtQyaBqbJR6g9E9TT0ygypmlNkxGmSnqeKA00MmQaYgGKnpi
pptU3pQ9EBoA00NAAGNDQ0AGQ0AAAAAEkhNGlPE1PTEZTTIaNA0aDQW1UW62KdWKwbMaIi10NSl0
dsZ+yEkd205fDyglfSz3Pn79andvMlcjKX5ce/HVGuGjDEcyvZWu9qP0x3EMfGXxWpxbd0Yhtjmn
pCCtSLkttmuumbQSpWsyQbxKxOckwuQtY69qk6IA0AhQDJ9kz5BJhm36MILgfWoHvR/ER8WlS4Fy
Y2X7xIsK/t2Y692eyguD/k/Vp1/gNuyQqFeGZa2LEStZStCWIOkDwlutgHA6awW5AZjKTbgha6+u
pgZXIG2stDEBnOppvNzEs+Am1rbDCKcDXGiseWBZNoicw2baifaFbjS6AXTFRXkInGC5jAIJ0uia
3qi7M4RA7cRf1MKjCwvSl+cDgYmMrTGlAIW0PN9WOoBcIRBEDKoro5DpmcMBmYMMRi2eaqGuFqqJ
Alg9xUpw4ESp2CGyvO1hk3P362hKlNnZMf2l/AaqZwXr74dZioLXhYbLRnr1lkkQlYxJ6pQq5hjZ
QKSWzSFSJhOXOBhyr4uOOF7X0Cy4I6bmGIhVaoectW28LnMkPnSNFvnpqWZOimxoe82tM1ofKURY
BcT2DUQPjKdKgDgqKP2zzeY388NMfZnVUhn8ZcRU3aOUdOZny2Qwaf+OPaAMBSeiZVBOYX5BO1+W
okEU6HVIv7d5cxmHYxQFR88+hy3OMogz9KMsrC0On5aiQLlK3BVpxxgQx8r63pPncTAXA81f7uGy
Hfxfrk1ByDoHpY6JcHicsjENwGQQCLg2wikMn9KK5ox4pEQ0BqVDpCrAwqDW8uUSuLaDLg0Q5oDI
sijv4VALAbHPPXBL0kME6/DlnxjANMWZPI3KfNsmkiHgNwTvwck7iDDklygGpWs5FOdpQireBStL
7ZoA0hTbMAhLuAqxY6IWA7mqVZInRVwuF1p7+8a10qzsrWqjVygdTgM7pAKwmZZ41WU3UawoWsOw
fS7KqRQOuiBO4/4u5IpwoSAQdyfe


--===============6859408313813198800==--