From: Marc Alff
Date: September 9 2010 8:51pm
Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3261 to 3262)
List-Archive: http://lists.mysql.com/commits/117937
Message-Id: <20100909205113.A69F745E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5541485898165307348=="

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

 3262 Marc Alff	2010-09-09 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

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

    modified:
      mysql-test/include/default_mysqld.cnf
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysys/my_gethwaddr.c
      mysys/my_sync.c
=== modified file 'storage/perfschema/ha_perfschema.cc'
--- a/storage/perfschema/ha_perfschema.cc	2010-07-23 17:08:41 +0000
+++ b/storage/perfschema/ha_perfschema.cc	2010-09-09 20:50:20 +0000
@@ -19,6 +19,7 @@
 */
 
 #include "my_global.h"
+#include "my_atomic.h"
 #include "my_pthread.h"
 #include "sql_plugin.h"
 #include "mysql/plugin.h"
@@ -28,6 +29,17 @@
 #include "pfs_instr_class.h"
 #include "pfs_instr.h"
 
+#ifdef MY_ATOMIC_MODE_DUMMY
+/*
+  The performance schema can can not function with MY_ATOMIC_MODE_DUMMY,
+  a fully functional implementation of MY_ATOMIC should be used instead.
+  If the build fails with this error message:
+  - either use a different ./configure --with-atomic-ops option
+  - or do not build with the performance schema.
+*/
+#error "The performance schema needs a functional MY_ATOMIC implementation."
+#endif
+
 handlerton *pfs_hton= NULL;
 
 static handler* pfs_create_handler(handlerton *hton,


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: b89409fb77f10709d69395bd906d1f3151262a48
# timestamp: 2010-09-09 14:51:13 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: marc.alff@stripped\
#   zvap9no52yu49rjt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZlmtWMAA3VfgAAQWHf/934i
hiC////wYAcTll8SSgt9ajkGO3swCEioZJ6lNqPKMPR6U2UzRqj1NpqZAzUyAlIGkYIDSmmakn+q
hoNA09RoBkDmAAmAAJgAAAAANNBFT9Uemk2oDJgBAZAAaYBFJJiNT9Qj1GjQeoAaANAaDJoJJNBA
E0ym0CmptqaehJ+qaHqeghoPvWRp5kVaX+G5/BuPNjz/amu1b8EPuw9zwpbvv33SrEzYh/LESruJ
ydA9JuV5LdqF/f6++m3J6r/XmRjZqMGB4+EEmcQHUaDbIc2XQpZmVlxiqgiv7gXGrWZa6/zYuGeQ
8zPNSy9J0bZSrXkoHH5uFMlStQ+dLdfE1Szey13clNcc2E26yiYhSDZvBqFs3BCDtyMpivxJMiul
efMVSlt4TwNRqJme3CNyKqtdKBst2BSF5DfjCjRj2bZmUrGfE7hh6ALcUBaZ7c3WL5m802C0F5LI
T5EMU6KjavS/RrGm2hHEmIJES4gmrvdxidezm/CyEIe/E13tYJ2D0YiVig2TDiomATwHEliUFJxU
mJyKiI9Nv3uKiQrihE0rO4URI+AkYdahTQ1hXSLDD0+L5IuYGYbiVz8isSWTDTkModElEeQJKTE3
nMwg6zMj8HfmcCREa3+ypxJJMSxOTznTnybU7a7BmNPqEr3NvJro/KhrzonxEgI1JUlVCJk1wpOc
xJSFQAcx0kTeNDV8xa5ZF3SavrUY6iNXIiOU8J8CsSolmZpG4iFW35ajzGfpKhxi5guxLOpsSM7o
y+jx4vfkTsbbtF0EmWGCWatVZ5E01nbHnbggVEeSUfUQaQsynyRoURHmI0WpYrsyx7RVhmWhoB5n
m2Z+q0vGqyNmo3T108ePC59jHwXq4Kqgu+QGF8RkkpxAlGOEn4LwboKOLGKObMYtxN1EMQnYiQgN
NRyTcW0mSsI7D6fmoZQiiFi2lXaOgYMEHaufDKQ+w/Iw0SsbNpiJ3EOcnCIZ40YPeJN7QCDM83PJ
unJI3GozIGVSK4Vz9vSVTlM+lyko1OziaTHlDQZEURUHDdCYwmKhphNKlQx5BmfPkYlgxgebMyjM
8C7iaxC9URUszY0Nv9u/zRzVaj6LmiWSKNLW0tLnixodKaUvW2bDUBoTG/b8HntGU4CS5u0T86g0
2vQ2hiOUBYM2bTEwzG8iL/dESB9eAhQLhtidLxWZ6iF9s3NCs0Co+y3cyIhYCKj/rpSmq+pnRCg8
Y1De/g2Lyn2r7+A7zpRA67iigsPoQtBgfRBibS4YGCLiE3sfvaQLfV6ixfHvE5Q28gl9b+kTDoC0
o5AQo2iFoXmfrCQd3IuK4KEHFS439rZmeBaioTHW2Im4cdO7qdbrPENCy01evbq/0HY+DULgxX80
i4ET2GphHiL+O7aKxW8dPqixOtOrTw+09pkeAuN2FRJFSBdd7vwY/e9vSmvhsBVgNTD4UOFPSZVV
A28fwOGYLJfz97rkarsKAsBFWXDcTx8AXazhfeSHOPQmjE7mAuE5G06aMfXn1kdC1e/wH92MpiFt
V8Ao3I4jCFFGa71/h0Kw6BE01CK2lQu3CQESSKLzYz2KfniyCTzDxku3uE2ENVAD5HYYiHsMtkwU
Eh2ny6i1FuJLGeHgqdBxLBMrMcGjusVk9IUip5DyBaLiZeCXTziNRP1sLSJFB2DYmahchExSgLvA
ozpWsUz5CibvdzF2qUBX6xrvuS1ZW92UPgBkFICBjUBVdA3TEZJxugmo0G+SrbMVMigvyxiPFMG0
OQHU6jQQxAaHeRReTXjI1wC1cRjGomDySJVGAYgGk1QkNqVAkBg4Q0AKJJ4QMxCcZSaxzNbSVCxA
wN12a5lksi3AxuiNLDgBM5JvOKryaJQaxG+uFS4kMYW3pymIZiZGe8MMKQQDecxVjxC0hoUJGAtw
joIdZi6B4iOmRINlTpqCGCKAJGtxQEowaitYpIReXngQCKSy5qtBrfHacFRTZNMhxcuYZi/mwqoz
bnu47bdVknGYVRpW2k58VeKcJA20lOYFBRP2FaGxhvoFy8c6nKu8wScvhiotTBiGET3rcKI56BRQ
TuOb3yLQ1LEoJMkyIlsy4Jm/nOTKDDKmx1aleluKQFcaLuu9uQGzgrScAsN0TyWwxFrs4iN62iss
A+gitBSoWZ8xUvThUJzPokME2A9XHW1kcgzeZ/xdyRThQkJlmtWM


--===============5541485898165307348==--