Merge pull request #708 from cyberious/master

(fix) - Check for mysql_verison before assuming that triggers are a valid permission

Author: hunner

README.md

@@ -784,7 +784,11 @@ The library file name.
 
 ###Facts
 
-####`mysql_server_id`
+#### `mysql_version`
+
+Determines the MySql version by parsing the output from `mysql --version`
+
+#### `mysql_server_id`
 
 Generates a unique id, based on the node's MAC address, which can be used as
 `server_id`. This fact will *always* return `0` on all nodes which only have

lib/facter/mysql_version.rb

@@ -0,0 +1,8 @@
+Facter.add("mysql_version") do
+  setcode do
+    mysql_ver = Facter::Util::Resolution.exec('mysql --version')
+    if mysql_ver
+      mysql_ver.match(/\d+\.\d+\.\d+/)[0]
+    end
+  end
+end

manifests/backup/mysqldump.pp

@@ -26,8 +26,7 @@
     require       => Class['mysql::server::root_password'],
   }
 
-
-  if $include_triggers {
+  if $include_triggers and versioncmp($::mysql_version, '5.1.5') > 0 {
     $privs = [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS', 'TRIGGER' ]
   } else {
     $privs = [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS' ]

spec/classes/mysql_server_backup_spec.rb

@@ -4,7 +4,7 @@
   on_pe_supported_platforms(PLATFORMS).each do |pe_version,pe_platforms|
     pe_platforms.each do |pe_platform,facts|
       describe "on #{pe_version} #{pe_platform}" do
-        let(:facts) { facts }
+        let(:facts) { {'mysql_version' => '5.1.6'}.merge(facts) }
 
         let(:default_params) {
           { 'backupuser'         => 'testuser',
@@ -26,7 +26,12 @@
           it { is_expected.to contain_mysql_grant('testuser@localhost/*.*').with(
             :privileges => ['SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS', 'TRIGGER']
           ).that_requires('Mysql_user[testuser@localhost]') }
-
+          context 'mysql < 5.1.6' do
+            let(:facts) { {'mysql_version' => '5.0.95'}.merge(facts) }
+            it { is_expected.to contain_mysql_grant('testuser@localhost/*.*').with(
+               :privileges => ['SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW', 'PROCESS']
+               ).that_requires('Mysql_user[testuser@localhost]') }
+          end
           context 'with triggers excluded' do
             let(:params) do
               { :include_triggers => false }.merge(default_params)
@@ -275,6 +280,15 @@
                 /ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --triggers"/
               )
             end
+            describe 'mysql_version < 5.0.11' do
+              let(:facts) { facts.merge({'mysql_version' => '5.0.10'}) }
+              it 'should backup triggers when asked' do
+                is_expected.to contain_file('mysqlbackup.sh').with_content(
+                   /ADDITIONAL_OPTIONS="\$ADDITIONAL_OPTIONS --triggers"/
+                )
+              end
+            end
+
           end
 
           context 'with include_triggers set to false' do

spec/unit/facter/mysql_version_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Facter::Util::Fact do
+  before {
+    Facter.clear
+  }
+
+  describe "mysql_version" do
+    context 'with value' do
+      before :each do
+        Facter::Util::Resolution.stubs(:exec).with('mysql --version').returns('mysql  Ver 14.12 Distrib 5.0.95, for redhat-linux-gnu (x86_64) using readline 5.1')
+      end
+      it {
+        expect(Facter.fact(:mysql_version).value).to eq('5.0.95')
+      }
+    end
+
+  end
+
+end