From 4e7e70b0f1d5506a5d4c9bff6f9cb80c01554cc9 Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Mon, 16 Mar 2020 13:42:44 -0400
Subject: [PATCH] MCOL-3887 - postconfig problem processing an upgrade

mycnfUpgrade has been looking for our mysql config mods
in the /etc/my.cnf/ directory, which is wrong obviously.  Looks like
an oversight; all of the code around it is looking in the right place.
Changed it to look in the right place.
---
 oamapps/postConfigure/mycnfUpgrade.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index 33f2f2f91..e35a36d57 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -136,7 +136,7 @@ int main(int argc, char* argv[])
     }
 
     //my.cnf.rpmsave file
-    string mycnfsaveFile = "/etc/my.cnf/columnstore.cnf.rpmsave";
+    string mycnfsaveFile = std::string(MCSMYCNFDIR) + "/columnstore.cnf.rpmsave";
     ifstream mycnfsavefile (mycnfsaveFile.c_str());
 
     if (!mycnfsavefile)