summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-11 12:55:42 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-11 12:55:42 +0200
commitae6330080102f31edd6cd3b49028f0f3e39be769 (patch)
treeb277d27fcc4f0471c86fd0b756f120718b8d759a /mysql-test/include
parent8feff690b6d1f09acb6a68315669e75924da5f80 (diff)
parent3e8731dee04ec5f47557e0a0f55aa5f6f8d1f698 (diff)
downloadmariadb-git-ae6330080102f31edd6cd3b49028f0f3e39be769.tar.gz
merge
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/default_mysqld.cnf2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
index e46c3bc3c17..a1b477c51dd 100644
--- a/mysql-test/include/default_mysqld.cnf
+++ b/mysql-test/include/default_mysqld.cnf
@@ -15,6 +15,8 @@ max_heap_table_size= 1M
loose-skip-innodb
loose-skip-pbxt
+loose-skip-feedback
+loose-feedback-user-info= mysql-test
loose-innodb_data_file_path= ibdata1:10M:autoextend