From 04836704f0186a9875899b11371d775a94b3a4dc Mon Sep 17 00:00:00 2001
From: Mauro Doglio <mdoglio@mozilla.com>
Date: Tue, 15 Sep 2015 16:17:48 +0100
Subject: [PATCH] Bug 1204918 - upgrade to mysql 5.6 for local development

---
 puppet/manifests/classes/mysql.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/puppet/manifests/classes/mysql.pp b/puppet/manifests/classes/mysql.pp
index 5e6ff3959..ebd981e14 100644
--- a/puppet/manifests/classes/mysql.pp
+++ b/puppet/manifests/classes/mysql.pp
@@ -12,7 +12,7 @@ $mysqlservice = $operatingsystem ? {
 }
 
 class mysql {
-  package { mysql-server:
+  package { 'mysql-server-5.6':
     ensure => installed
   }
 
@@ -23,7 +23,7 @@ class mysql {
   service { $mysqlservice:
     ensure => running,
     enable => true,
-    require => Package['mysql-server'],
+    require => Package['mysql-server-5.6'],
   }
 
   if $operatingsystem == 'ubuntu'{
@@ -32,7 +32,7 @@ class mysql {
       owner => "root", group => "root", mode => 0644,
       notify => Service[$mysqlservice],
       require => [
-          Package['mysql-server']
+          Package['mysql-server-5.6']
       ]
     }
   }