From 3e14ef9db408c737ab4dba13f917b1466e3403a9 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 23 Aug 2015 17:44:50 +1000
Subject: [PATCH 1/4] travis: add mariadb test

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 903098f..b55e2ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: false
+
 language: perl
 perl:
    - "blead"
@@ -10,6 +12,18 @@ perl:
    - "5.8"
    - "5.6"
 
+matrix:
+    include:
+        - addons:
+             mariadb: 5.5
+          perl: 5.20
+        - addons:
+             mariadb: 10.0
+          perl: 5.20
+        - addons:
+             mariadb: 10.1
+          perl: 5.20
+
 before_install:
    - git clone git://github.com/haarg/perl-travis-helper
    - source perl-travis-helper/init

From 6e48e42219eb3f87814b4309c53a5ec253ba9d51 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 23 Aug 2015 17:57:10 +1000
Subject: [PATCH 2/4] quantified path to ./mysqltuner.pl

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b55e2ca..4e82768 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,4 +34,4 @@ install:
    - cpanm --quiet --notest Data::Dumper
 
 script:
-   - mysqltuner
+   - ./mysqltuner.pl

From 08a2d209a2065a4c86c17dff45868a3b07edbb6f Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 23 Aug 2015 18:12:57 +1000
Subject: [PATCH 3/4] remove perl-5.6 from tests

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4e82768..6d766c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ perl:
    - "5.12"
    - "5.10"
    - "5.8"
-   - "5.6"
 
 matrix:
     include:

From 2da87e05a5e8911fbfa85375235b11c11837fec9 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Mon, 24 Aug 2015 17:33:41 +1000
Subject: [PATCH 4/4] A user with a plugin isn't the same as an empty password

---
 mysqltuner.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysqltuner.pl b/mysqltuner.pl
index 4d0fc89..2f57840 100755
--- a/mysqltuner.pl
+++ b/mysqltuner.pl
@@ -705,7 +705,7 @@ sub security_recommendations {
 
     # Looking for Empty Password
     @mysqlstatlist = select_array
-"SELECT CONCAT(user, '\@', host) FROM mysql.user WHERE password = '' OR password IS NULL";
+"SELECT CONCAT(user, '\@', host) FROM mysql.user WHERE (password = '' OR password IS NULL) AND (plugin='' OR plugin IS NULL)";
     if (@mysqlstatlist) {
         foreach my $line ( sort @mysqlstatlist ) {
             chomp($line);