From aade05cb67df1ac6794ffb6986bec84fb1b16984 Mon Sep 17 00:00:00 2001
From: Jean-Marie Renouard <jmrenouard@gmail.com>
Date: Sat, 17 Jun 2023 17:38:18 +0200
Subject: [PATCH] Adding basic Jenkinsfile Removing mysqladmin dependency
 (first steps)

---
 JenkinsFile   |  0
 mysqltuner.pl | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 JenkinsFile

diff --git a/JenkinsFile b/JenkinsFile
new file mode 100644
index 0000000..e69de29
diff --git a/mysqltuner.pl b/mysqltuner.pl
index 39db563..8562704 100644
--- a/mysqltuner.pl
+++ b/mysqltuner.pl
@@ -742,7 +742,7 @@ sub mysql_setup {
     elsif ( !-e $mysqladmincmd ) {
         badprint
 "Couldn't find mysqladmin/mariadb-admin in your \$PATH. Is MySQL installed?";
-        exit 1;
+        #exit 1;
     }
     if ( $opt{mysqlcmd} ) {
         $mysqlcmd = $opt{mysqlcmd};
@@ -824,7 +824,7 @@ sub mysql_setup {
             "-u $opt{user} "
           . ( ( $opt{pass} ne 0 ) ? "-p'$opt{pass}' " : " " )
           . $remotestring;
-        my $loginstatus = `$mysqladmincmd ping $mysqllogin 2>&1`;
+        my $loginstatus = `$mysqlcmd -Nrs -e 'select "mysqld is alive";' $mysqllogin 2>&1`;
         if ( $loginstatus =~ /mysqld is alive/ ) {
             goodprint "Logged in using credentials passed on the command line";
             return 1;
@@ -956,7 +956,17 @@ sub mysql_setup {
     else {
         # It's not Plesk or Debian, we should try a login
         debugprint "$mysqladmincmd $remotestring ping 2>&1";
-        my $loginstatus = `$mysqladmincmd $remotestring ping 2>&1`;
+        
+        #my $loginstatus = "";
+        debugprint "Using mysqlcmd: $mysqlcmd";
+        #if (defined($mysqladmincmd)) {
+        #  infoprint "Using mysqladmin to check login";
+        #  $loginstatus=`$mysqladmincmd $remotestring ping 2>&1`;
+        #} else {
+        infoprint "Using mysql to check login";
+        my $loginstatus=`$mysqlcmd $remotestring -Nrs -e 'select "mysqld is alive"' --connect-timeout=3 2>&1`;
+        #}
+        
         if ( $loginstatus =~ /mysqld is alive/ ) {
 
             # Login went just fine