From 7c51a70b361ed1d0d568f45faa795dc0d3c3594c Mon Sep 17 00:00:00 2001
From: Jean-Marie RENOUARD <jmrenouard@gmail.com>
Date: Mon, 24 Aug 2015 09:51:03 +0200
Subject: [PATCH] Issue #113: Typo fix Issue #111: MariaDB 10 and 11 as
 supported version Issue #109: Ne line at the end of help display

---
 mysqltuner.pl | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mysqltuner.pl b/mysqltuner.pl
index 4d0fc89..496a2f7 100755
--- a/mysqltuner.pl
+++ b/mysqltuner.pl
@@ -123,7 +123,7 @@ sub usage {
       . "      --dbstat             Print database information\n"
       . "      --idxstat            Print index information\n"
       . "      --nocolor            Don't print output in color\n"
-      . "      --buffers            Print global and per-thread buffer values";
+      . "      --buffers            Print global and per-thread buffer values\n";
     exit;
 }
 
@@ -857,11 +857,10 @@ sub validate_mysql_version {
           . $myvar{'version'}
           . " is EOL software!  Upgrade soon!";
     }
-    elsif ( mysql_version_ge(6) ) {
+    elsif ( ( mysql_version_ge(6) and mysql_version_le(9) ) or  mysql_version_ge(12) ) {
         badprint "Currently running unsupported MySQL version "
           . $myvar{'version'} . "";
-    }
-    else {
+    } else {
         goodprint "Currently running supported MySQL version "
           . $myvar{'version'} . "";
     }
@@ -878,6 +877,17 @@ sub mysql_version_ge {
         || $mysqlverminor == $min && $mysqlvermicro >= $mic );
 }
 
+# Checks if MySQL version is lower than equal to (major, minor, micro)
+sub mysql_version_le {
+    my ( $maj, $min, $mic ) = @_;
+    $min ||= 0;
+    $mic ||= 0;
+    return $mysqlvermajor < $maj
+      || $mysqlvermajor == $maj
+      && ( $mysqlverminor < $min
+        || $mysqlverminor == $min && $mysqlvermicro <= $mic );
+}
+
 # Checks for 32-bit boxes with more than 2GB of RAM
 my ($arch);
 
@@ -1920,7 +1930,7 @@ sub mysql_stats {
                   . $myvar{'open_files_limit'}
                   . ") variable " );
             push( @generalrec,
-                    "should be greater that $table_cache_var ( "
+                    "should be greater than $table_cache_var ( "
                   . $myvar{$table_cache_var}
                   . ")" );
         }