Loosen MariaDB recognition to fix it on Debian 8

puppetlabs · Mar 18, 2016 · 1a67c38 · 1a67c38
1 parent d58a100
commit 1a67c38
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/puppet/provider/mysql.rb b/lib/puppet/provider/mysql.rb
@@ -21,7 +21,7 @@ def self.defaults_file
 
   def self.mysqld_type
     # find the mysql "dialect" like mariadb / mysql etc.
-    mysqld_version_string.scan(/\s\(mariadb/i) { return "mariadb" }
+    mysqld_version_string.scan(/mariadb/i) { return "mariadb" }
     mysqld_version_string.scan(/\s\(mysql/i) { return "mysql" }
     mysqld_version_string.scan(/\s\(percona/i) { return "percona" }
     nil

diff --git a/spec/unit/puppet/provider/mysql_user/mysql_spec.rb b/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
@@ -34,6 +34,12 @@
         :string => '/usr/sbin/mysqld  Ver 10.0.21-MariaDB for Linux on x86_64 (MariaDB Server)',
         :mysql_type => 'mariadb',
       },
+      'mariadb-10.0-deb8' =>
+      {
+        :version => '10.0.23',
+        :string => '/usr/sbin/mysqld (mysqld 10.0.23-MariaDB-0+deb8u1)',
+        :mysql_type => 'mariadb',
+      },
       'percona-5.5' =>
       {
         :version => '5.5.39',