diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-21 11:20:53 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-21 11:20:53 +0200 |
| commit | add465e5a1e38821ee8e7eefd0cc323f280507ad (patch) | |
| tree | 5284e145f525690cbe056d9703a9fef0cb1edc99 /mysql-test/include | |
| parent | 3cdf62b02105696d86bcba86b384f579936b9fd9 (diff) | |
| parent | f703a7779fed9a9b677649ba443a6b467f0125d2 (diff) | |
| download | mariadb-git-add465e5a1e38821ee8e7eefd0cc323f280507ad.tar.gz | |
merge from 5.5
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/default_mysqld.cnf | 6 |
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 |