summaryrefslogtreecommitdiff
path: root/storage/perfschema
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2010-08-24 18:21:43 -0600
committerMarc Alff <marc.alff@oracle.com>2010-08-24 18:21:43 -0600
commitd2df3a8ac575489e1e31e1238afaedfdbd063ff9 (patch)
tree5f405beb13574505505f6e071271acdb53890e06 /storage/perfschema
parentb7f0ce88d0ccdd10530b3d4d909cb3fce70cc10d (diff)
downloadmariadb-git-d2df3a8ac575489e1e31e1238afaedfdbd063ff9.tar.gz
Bug#55576 Two perfschema tests failed on mysql-next-mr-innodb PB2 tests
Before this fix, some tests failed due to lack of instrumentation slots in the performance schema, because the default sizing was too low. Now that more code has been instrumented, the default sizing has to be adjusted to match the current instrumentation consumption. This change: - increases the number of rwlock classes from 20 to 30, - increases the number of rwlock and mutex instances to 1 million. Both are to account for the volume of data instrumented when the innodb storage engine is used (because of the innodb buffer pool). Adjusted the test output accordingly.
Diffstat (limited to 'storage/perfschema')
-rw-r--r--storage/perfschema/pfs_server.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/perfschema/pfs_server.h b/storage/perfschema/pfs_server.h
index a7af27c1038..8cb68cd52b1 100644
--- a/storage/perfschema/pfs_server.h
+++ b/storage/perfschema/pfs_server.h
@@ -25,13 +25,13 @@
#define PFS_MAX_MUTEX_CLASS 200
#endif
#ifndef PFS_MAX_MUTEX
- #define PFS_MAX_MUTEX 1000
+ #define PFS_MAX_MUTEX 1000000
#endif
#ifndef PFS_MAX_RWLOCK_CLASS
- #define PFS_MAX_RWLOCK_CLASS 20
+ #define PFS_MAX_RWLOCK_CLASS 30
#endif
#ifndef PFS_MAX_RWLOCK
- #define PFS_MAX_RWLOCK 1000
+ #define PFS_MAX_RWLOCK 1000000
#endif
#ifndef PFS_MAX_COND_CLASS
#define PFS_MAX_COND_CLASS 80