List:Commits« Previous MessageNext Message »
From:Marc Alff Date:September 9 2010 8:51pm
Subject:bzr push into mysql-trunk-bugfixing branch (marc.alff:3261 to 3262)
View as plain text  
 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,


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100909205020-ausisfq1qjnl3ip2.bundle
Thread
bzr push into mysql-trunk-bugfixing branch (marc.alff:3261 to 3262) Marc Alff9 Sep