From: Tor Didriksen
Date: September 10 2010 9:17am
Subject: bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3262 to 3263)
List-Archive: http://lists.mysql.com/commits/117978
Message-Id: <20100910091738.414AC29D0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0274430594657173851=="

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

 3263 Tor Didriksen	2010-09-10 [merge]
      Header files should be self-contained

    modified:
      storage/perfschema/ha_perfschema.cc
 3262 Marc Alff	2010-09-09 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      storage/perfschema/ha_perfschema.cc
=== modified file 'storage/perfschema/ha_perfschema.cc'
--- a/storage/perfschema/ha_perfschema.cc	2010-09-09 20:50:20 +0000
+++ b/storage/perfschema/ha_perfschema.cc	2010-09-10 09:11:19 +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"


--===============0274430594657173851==
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\
#   rtbdd9jz303osl9c
# target_branch: file:///export/home/didrik/repo/trunk-bugfixing-\
#   56521/
# testament_sha1: ddc89065e25d5f30c0c4c2cc1efa62dbc4bc2457
# timestamp: 2010-09-10 11:17:38 +0200
# source_branch: file:///export/home/didrik/repo/5.5-bugfixing-56521/
# base_revision_id: marc.alff@stripped\
#   ausisfq1qjnl3ip2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaMZj1EAAxXfgAAQWGP/91ZA
BAC////wUAV5vBUqkAAAAMaGhoAMhoAAAAAJSBGJqeQKeTTUPUAAAGganoU01GTRtQAAADQABjQ0
NABkNAAAAAAqUIJoANEDU0xPUEnqeFPIalm8GIjVapOkJKFSlwirUJM6JeQ4JdWCsJUkUPhrhQJk
ggJJAq4OEvhpA8EOJrTvRlZGSA7jeJwg9OI2Y1Qjj6Fh67bsS0oTF2rx6kGNWhwUJkvRp5KH5Eof
dpPh3fduTJHg8mbM4p4tVdWjYNyd6J4IePJ0w3a8a1rr391NEWpSiWbPItSWSRaoLktayUPCsWR+
Ea0twUKXZc6vw3pbUIpgOWDEUi6/LVysvbU10KUdmr3MEkqHzojK5rfk3erBNCa0uXrlkyXt+2/M
8xgjhGfJAaOuMjDx1mJyavNshwRsIz0KhbDinTFn+z/Dpyv2Ohxno6pJcmMX0L3i5ZLa6Kr4l4mg
ak5bwzoRDWDpgORJ6TiSELuoQjCgaGl7YXjk/hFxk4lipzGRNWDGkCzEQugkHJYKe4wDvauFWpM2
2hzUbHc+iKacJ6X8pVilg20ZNIYRGhcJbmV44vqVw5g3LjBVgUFyMgLtym+50dDe0PTZws4NGLVU
2bcNzEYd7Tc5ua5XXDIwLUHiTsZRZXDlEzoGxIrzhUj2mA9ZMkJCup1b0MGIhB785xeRUChlGvY8
jIewaOUJvCsXinKa7C6gKKXKQwZ5tma7XuZcPKaNLUtNFd5tZXLJwXXr3FxTZoaWyjQo0LKsmxTB
iMVi9VKMVLy+TDFRimHzNjo3LlGs7UpTwfd9HMXoYaaUUSj9alupRrYKyeCfP0+mBrHThcmaivGj
n5O5Wvjgnw7dkThjSYtG5fJueo9s2hFy9nyGtGCKx8D24tynr06cJc99nd3PTo9eSdVeraje0vOH
ZVtVKHcLb2/h4p6W/3Dl3uvuHWqiJbJE4uDs88LJyyeDhf2ya2uN+SdLN7yTBOufJM+M2xmh7zQk
fbT0ZKEnfrt38+EfVSL2Cjyth3rez2cWc9FK7WuTX/bt70avFu9M3Bx01XPXFfo2rutWWf4WPZuF
CNh9Uom40Tu6Ooxo6OrwMhglVzzycfL1cndRbnVd1GdamkbT9PZ8T3utZ2dDmKrnKHZ2zmI+L/ij
RcPBL1PNNsVmbY2Pg/1P8dULMVTAjuFjl+/xJzbPy/vwZrnIfQ95U+Q/idm9c9LI/RZPgnXxo8ZP
YjqLjAZLCqeq9iiUS5zhwXsWH3RMByHlGhVkblkYKLj0vxXpRCjydEYr0XKTzbP2aC9RL6JROeza
SWH9KrT+PRD+IlJMY+tU3Jq+LNrN5xzUUS4zeCaGrPBdsOR5H1PMyXO+qFbikrA/8uG+cKVRqeTg
aIbPkRpjnbgzTBffRKtKLe5xFzS+JGzaaaqUa164Zln4TVN1JTamoyG30ckeaWWfIo4vNLNTeerg
nPJt0Nh/TqpWKKqV+TZJtkthVNLjr4NTvY5bDM0pmPsdk+ybVyZJ63plfL3mn/xdyRThQkKMZj1E


--===============0274430594657173851==--