summaryrefslogtreecommitdiff
path: root/mysql-test/include/default_my.cnf
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@sun.com>2010-01-11 18:47:27 -0700
committerMarc Alff <marc.alff@sun.com>2010-01-11 18:47:27 -0700
commite0e0f9e3d46917fe9b611fc9769e64032c267446 (patch)
treec111d4c62b1e1eb7a74ec68860756418e29cb61e /mysql-test/include/default_my.cnf
parent3d915225611a921fad03934e58bf281b48fc15b0 (diff)
downloadmariadb-git-e0e0f9e3d46917fe9b611fc9769e64032c267446.tar.gz
WL#2360 Performance schema
Part V: performance schema implementation
Diffstat (limited to 'mysql-test/include/default_my.cnf')
-rw-r--r--mysql-test/include/default_my.cnf17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/include/default_my.cnf b/mysql-test/include/default_my.cnf
index 428c2166947..6888a69b0a4 100644
--- a/mysql-test/include/default_my.cnf
+++ b/mysql-test/include/default_my.cnf
@@ -1,3 +1,18 @@
+# Copyright (C) 2009 Sun Microsystems, Inc
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
# Use default setting for mysqld processes
!include default_mysqld.cnf
!include default_client.cnf
@@ -9,6 +24,8 @@
log-bin= master-bin
+# Run tests with the performance schema instrumentation
+loose-enable-performance-schema
[mysqlbinlog]
disable-force-if-open