List:Commits« Previous MessageNext Message »
From:Marc Alff Date:September 9 2010 9:15pm
Subject:bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3282)
View as plain text  
#At file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-merge/ based on revid:klewis@stripped

 3282 Marc Alff	2010-09-09 [merge]
      Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing

    modified:
      mysql-test/suite/perfschema/r/privilege_table_io.result
      storage/perfschema/ha_perfschema.cc
=== modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result'
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result	2010-09-09 10:54:19 +0000
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result	2010-09-09 21:15:04 +0000
@@ -24,11 +24,11 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	1000000
+performance_schema_max_mutex_instances	10000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	1000000
-performance_schema_max_table_handles	10000
-performance_schema_max_table_instances	1000
+performance_schema_max_rwlock_instances	10000
+performance_schema_max_table_handles	1000
+performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	1000
 show status like "performance_schema%";

=== 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-20100909211504-rf25mlg9ozpwt2kl.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3282) Marc Alff9 Sep