From aa96e56c55c44d2c20c1cd70325ef88ad0af8f98 Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Tue, 9 Jul 2019 16:54:08 +0200
Subject: Improved error messages and added another path to the version check
 utility

---
 mysql-test/mysql-test-run.pl | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'mysql-test/mysql-test-run.pl')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 630eec67e3d..3cc4a74dda3 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -401,9 +401,19 @@ sub check_wsrep_version() {
 }
 
 sub wsrep_version_message() {
-  my $output= `$My::SafeProcess::wsrep_check_version -p`;
-  $output =~ s/\s+\z//;
-  return "Wsrep provider version mismatch (".$output.")";
+  if ($My::SafeProcess::wsrep_check_version ne "") {
+     my $output= `$My::SafeProcess::wsrep_check_version -p`;
+     if (($? >> 8) == 0) {
+        $output =~ s/\s+\z//;
+        return "Wsrep provider version mismatch (".$output.")";
+     }
+     else {
+        return "Galera library does not contain a version symbol";
+     }
+  }
+  else {
+     return "Unable to find a wsrep version check utility";
+  }
 }
 
 sub which($) { return `sh -c "command -v $_[0]"` }
-- 
cgit v1.2.1