Merge branch 'master' into bv-add-jvm-mem-params

travis-ci · Aug 21, 2017 · f06cfc9 · f06cfc9
2 parents f55eebf + a077bc2
commit f06cfc9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/cookbooks/travis_build_environment/recipes/mysql.rb b/cookbooks/travis_build_environment/recipes/mysql.rb
@@ -67,12 +67,11 @@
   EOF
 end
 
-service 'mysql' do
-  action %i[enable start]
-end
-
-bash 'setup mysql users and passwords' do
-  code "mysql -u root <#{mysql_users_passwords_sql}"
+template "/etc/mysql/conf.d/performance-schema.cnf" do
+  source 'root/performance-schema.cnf.erb'
+  owner 'root'
+  group 'root'
+  mode 0o640
 end
 
 template "#{node['travis_build_environment']['home']}/.my.cnf" do
@@ -83,6 +82,14 @@
   variables(socket: node['travis_build_environment']['mysql']['socket'])
 end
 
+service 'mysql' do
+  action %i[enable start]
+end
+
+bash 'setup mysql users and passwords' do
+  code "mysql -u root <#{mysql_users_passwords_sql}"
+end
+
 include_recipe 'travis_build_environment::bash_profile_d'
 
 file ::File.join(

diff --git a/cookbooks/travis_build_environment/templates/default/root/performance-schema.cnf.erb b/cookbooks/travis_build_environment/templates/default/root/performance-schema.cnf.erb
@@ -0,0 +1,2 @@
+[mysqld]
+performance_schema=OFF