diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /mysql-test/include/default_my.cnf | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'mysql-test/include/default_my.cnf')
| -rw-r--r-- | mysql-test/include/default_my.cnf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf index 83c67638d4e..a4f3b14fd54 100644 --- a/mysql-test/include/default_my.cnf +++ b/mysql-test/include/default_my.cnf @@ -22,8 +22,6 @@ # Run the master.sh script before starting this process #!run-master-sh -log-bin= master-bin - # Run tests with the performance schema instrumentation loose-enable-performance-schema |