Merge lp:~jjo/charms/trusty/mysql/add-wait-timeout into lp:charms/trusty/mysql

[JuanJo Ciarlante]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2463 mysql for jjo mp251744
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2463/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2253 mysql for jjo mp251744
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (errors=1)
  make: *** [test] Error 1

Full unit test output: http://paste.ubuntu.com/10527471/
Build: http://10.245.162.77:8080/job/charm_unit_test/2253/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2340 mysql for jjo mp251744
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10528531/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2340/

[Jorge Niedbalski (niedbalski)]

LGTM +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-02-04 16:16:30 +0000
+++ config.yaml	2015-03-04 14:12:08 +0000
@@ -27,6 +27,10 @@
         default: -1
         type: int
         description: Maximum connections to allow. -1 means use the server's compiled in default.
+    wait-timeout:
+        default: -1
+        type: int
+        description: The number of seconds the server waits for activity on a noninteractive connection before closing it. -1 means use the server's compiled in default.
     binlog-format:
         default: 'MIXED'
         type: string

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-12-23 12:18:57 +0000
+++ hooks/config-changed	2015-03-04 14:12:08 +0000
@@ -177,8 +177,14 @@
 else:
     configs['max-connections'] = 'max_connections = %s' % configs['max-connections']
 
+if configs['wait-timeout'] == -1:
+    configs['wait-timeout'] = '# wait_timeout = ?'
+else:
+    configs['wait-timeout'] = 'wait_timeout = %s' % configs['wait-timeout']
+
+
 if configs['prefer-ipv6']:
-    configs['bind-address'] = '::' 
+    configs['bind-address'] = '::'
 else:
     configs['bind-address'] = '0.0.0.0'
 
@@ -255,6 +261,7 @@
 # the first time they are touched
 myisam-recover         = BACKUP
 %(max-connections)s
+%(wait-timeout)s
 #table_cache            = 64
 #thread_concurrency     = 10
 #