summaryrefslogtreecommitdiff
path: root/mysql-test/include/default_mysqld.cnf
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2010-09-08 12:01:12 -0600
committerMarc Alff <marc.alff@oracle.com>2010-09-08 12:01:12 -0600
commitc314b3f1df52aaa180655ba91e7652ef05b07558 (patch)
treeeb607d38c8621f6f3c6d084fbcfa34117be335f2 /mysql-test/include/default_mysqld.cnf
parent744c1013a2b429557fec07246e812fcc40ec00a8 (diff)
downloadmariadb-git-c314b3f1df52aaa180655ba91e7652ef05b07558.tar.gz
Bug#56528 Increased server footprint with MTR
With recent changes in the performance schema default sizing parameters, the memory used by a mysqld binary increased accordingly. This negatively affects the MTR test suite, because running several tests in parallel now consumes more ressources. The fix is to leave the default production values unchanged, and to configure the MTR environment to limit memory used when running tests in the test suite, which is ok because only a few objects are typically used within a test script. This fix: - changed the default configuration in MTR to use less memory - adjusted the performance schema tests accordingly Note that 1,000 mutex instances was too short and caused test failures in the past in team trees, so the default used is now 10,000 in MTR. The amount of memory used by the performance schema itself can be observed with the statement SHOW ENGINE PERFORMANCE_SCHEMA STATUS
Diffstat (limited to 'mysql-test/include/default_mysqld.cnf')
-rw-r--r--mysql-test/include/default_mysqld.cnf6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
index 46fdda7df84..f83b671b5dc 100644
--- a/mysql-test/include/default_mysqld.cnf
+++ b/mysql-test/include/default_mysqld.cnf
@@ -43,5 +43,11 @@ log-bin=mysqld-bin
# Run tests with the performance schema instrumentation
loose-enable-performance-schema
+# Run tests with a small number of instrumented objects
+# to limit memory consumption with MTR
+loose-performance-schema-max-mutex-instances=10000
+loose-performance-schema-max-rwlock-instances=10000
+loose-performance-schema-max-table-instances=500
+loose-performance-schema-max-table-handles=1000
binlog-direct-non-transactional-updates