From: Tor Didriksen
Date: September 10 2010 7:33am
Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3283 to 3284)
List-Archive: http://lists.mysql.com/commits/117963
Message-Id: <20100910073354.B8B0A29D0@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5388969621233838538=="

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

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

    modified:
      storage/perfschema/ha_perfschema.cc
 3283 Evgeny Potemkin	2010-09-10 [merge]
      Auto-merge: next-mr-opt-team => next-mr-bugfixing.

    modified:
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none.result
      mysql-test/r/select_none_jcl6.result
      mysql-test/r/subquery_mat.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_mat_none.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_jcl6.result
      mysql-test/r/subquery_sj_all_jcl7.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_jcl6.result
      mysql-test/r/subquery_sj_dupsweed_jcl7.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_jcl6.result
      mysql-test/r/subquery_sj_firstmatch_jcl7.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_jcl6.result
      mysql-test/r/subquery_sj_loosescan_jcl7.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_jcl6.result
      mysql-test/r/subquery_sj_mat_jcl7.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      sql/item.cc
      sql/item.h
      sql/item_subselect.cc
      sql/sql_select.cc
      sql/table.h
=== 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 07:33:32 +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"


--===============5388969621233838538==
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\
#   xt5n6obx1xpseqa9
# target_branch: file:///export/home/didrik/repo/next-mr-bf/
# testament_sha1: d9124657361e3101ae34264e537b3b0802b567f4
# timestamp: 2010-09-10 09:33:54 +0200
# base_revision_id: epotemkin@stripped\
#   rassobvu9zlht9h1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdKahvgAAW7fgAAQWGP/91ZA
BAC////wUANZpsNgeZt2hJIptCPQTBNGhqZPIo0aANAyUeoxTxMU9E0htR6gA0AAGJAIU3qaCGmT
TTEaD1NMgaGNDQ0AGQ0AAAAAElKfqJkGRo0aeo0AAaAAV6w/DML1fjLXOoA9AY2yutk2TdG7bRBI
YehlzhIKxBl1OUuXC5sP5+J6MPph8ZM+StaraWQ0I522S9kOQIQNn6QOWYnvO5AWo55y9yhMCc51
i+/C4nHsjbaCQwJRxGDQeUzPMXMCuItLBwItmA4Cb2oBRFbtEDMgIEQPnR0ENV4u1vLOiXXGbXKv
rNZi887HEo3nCMbU0mZ2PhZFjft4uFE6lE1enFCeocTDAdvQaTLFvrVQKjck1QQEwDIG3DCCXiD7
rI27phxtohn0yM944GGoaYrYFFQ0TUQskBdcWC4zYdOGIaktQcDaQ7fQbdrtuwUkaQZm0agyOGiA
xo0MhA7Lq5u571ZYFGKGgZN6hSgIqlRUNY7N4kIsvEYMzGJ/DC7EbVbNGzMoyk4SDFRUBACMlLcN
Vt9ivHau7337FyZLbKDH33PyGjBwYLXzrAiDladHWl/pw5mooL/a6Ab1Gp4Veulz9l1u1D05a65l
i7uNC4vydNl7IOqITMMUYcoyXrhrhwxDg5gHwSKq/FEHqufrqXOjFQTUkmxU7sIlSXIggw13ysg8
Y17P5GOMK7TPrLnqOp3B0/XftnlXXfe5qJLKdGl93GdAWJwFZ8Jl3TxTGEOgbGw6Yk4Vyp8lRx3q
xZSbT899SLFldQO6o7c6U6uFVTooAnULriepUxjkLm74vdKTRViuBQDE/ZeXBhk9Yp2vhwdpD8tD
UdqyeQLCGYCFPB8QRsGEaABF1+8qsZSwJEgL9Bm1grAxhAadf6ZykOIKcXEtpo8F1Gp0kIIvRR15
TwBrjAMAMzOHTYTeAYJ183JlHS/dbYzJ5fkpZrFjL/RQokF73qd+MXpMnAuT1DM5FumYjRJuAsqd
r0MAOglug0e0CIT8kEn3qBjbxMBgkT9mNCkCLOnMnQ5FVUI2zE7JjtvVs8OlB7HMZ3mgKQgy2+Fd
Ru5TUTK4Oa9V6pwvQK6AoZHUB0xxN3Kf8XckU4UJDSmob4A=


--===============5388969621233838538==--