From 35c1e5dd424a908b14e6a55d346794245d26be33 Mon Sep 17 00:00:00 2001 From: mattab <matthieu.aubry@gmail.com> Date: Sat, 10 Jan 2015 00:52:37 +1300 Subject: [PATCH] Set max_allowed_packet with correct format --- .travis.yml | 6 +++--- plugins/TestRunner/templates/travis.yml.twig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9187d619b6..f627127ecb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,9 +110,9 @@ before_script: - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default # try to avoid mysql has gone away errors - mysql -e "SET GLOBAL wait_timeout = 36000;" - - mysql -e "SET GLOBAL max_allowed_packet = 128M;" - - mysql -e "SHOW VARIABLES max_allowed_packet;" - - mysql -e "SHOW VARIABLES wait_timeout;" + - mysql -e "SET GLOBAL max_allowed_packet = 134209536;" + - mysql -e "SHOW VARIABLES LIKE 'max_allowed_packet';" + - mysql -e "SHOW VARIABLES LIKE 'wait_timeout';" - mysql -e "SELECT @@sql_mode;" # - mysql -e "SHOW GLOBAL VARIABLES;" diff --git a/plugins/TestRunner/templates/travis.yml.twig b/plugins/TestRunner/templates/travis.yml.twig index 42e017a69e..3c2b0f662d 100644 --- a/plugins/TestRunner/templates/travis.yml.twig +++ b/plugins/TestRunner/templates/travis.yml.twig @@ -144,9 +144,9 @@ before_script: - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'" # Travis default # try to avoid mysql has gone away errors - mysql -e "SET GLOBAL wait_timeout = 36000;" - - mysql -e "SET GLOBAL max_allowed_packet = 128M;" - - mysql -e "SHOW VARIABLES max_allowed_packet;" - - mysql -e "SHOW VARIABLES wait_timeout;" + - mysql -e "SET GLOBAL max_allowed_packet = 134209536;" + - mysql -e "SHOW VARIABLES LIKE 'max_allowed_packet';" + - mysql -e "SHOW VARIABLES LIKE 'wait_timeout';" - mysql -e "SELECT @@sql_mode;" # - mysql -e "SHOW GLOBAL VARIABLES;" -- GitLab