From 072404b5693439b728d49d26c2c11ed69172a40d Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Mon, 22 Aug 2016 18:23:35 +0200
Subject: Don't trigger mariadb upgrade dump/restore when not needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When upgrading from mariadb X.Y.Z to mariadb X.Y.Ž (X.Y part stays the
same), the dump/restore of mariadb shouldn't be necessary. Therefore we
now only check for up to the first 2 fields of the version string when
determining if we should trigger the dump/restore operation.

Closes-Bug: #1615721
Change-Id: Ib7af8bfb121f5c83184d51b3c6dc657108c25973
---
 extraconfig/tasks/major_upgrade_pacemaker_migrations.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
index 164269dc..c36786a9 100644
--- a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
+++ b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
@@ -38,11 +38,11 @@ function is_mysql_upgrade_needed {
     fi
 
     local currentepoch=$(rpm -q --qf "%{epoch}" $name)
-    local currentversion=$(rpm -q --qf "%{version}" $name)
+    local currentversion=$(rpm -q --qf "%{version}" $name | cut -d. -f-2)
     local currentrelease=$(rpm -q --qf "%{release}" $name)
     local newoutput=$(repoquery -a --pkgnarrow=updates --qf "%{epoch} %{version} %{release}\n" $name)
     local newepoch=$(echo "$newoutput" | awk '{ print $1 }')
-    local newversion=$(echo "$newoutput" | awk '{ print $2 }')
+    local newversion=$(echo "$newoutput" | awk '{ print $2 }' | cut -d. -f-2)
     local newrelease=$(echo "$newoutput" | awk '{ print $3 }')
 
     # With this we trigger the dump restore/path if we change either epoch or
-- 
cgit 1.2.3-korg