From: Tor Didriksen Date: September 10 2010 9:17am Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3284 to 3285) List-Archive: http://lists.mysql.com/commits/117977 Message-Id: <20100910091723.5FFE729D0@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1529389549748524345==" --===============1529389549748524345== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3285 Tor Didriksen 2010-09-10 [merge] Header files should be self-contained 3284 Tor Didriksen 2010-09-10 Header files should be self-contained modified: storage/perfschema/ha_perfschema.cc --===============1529389549748524345== 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\ # 9nyb8u0bybm0o4ql # target_branch: file:///export/home/didrik/repo/next-mr-bf-56521/ # testament_sha1: 137d3f6b10998308567a51c5ca48e0e9ea601a74 # timestamp: 2010-09-10 11:17:23 +0200 # source_branch: file:///export/home/didrik/repo/trunk-bugfixing-\ # 56521/ # base_revision_id: tor.didriksen@stripped\ # xt5n6obx1xpseqa9 # # Begin bundle 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 --===============1529389549748524345==--