From 607ae3f3d1f6a832cd184393616eddcd697508e5 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 2 Dec 2020 15:43:58 +0400 Subject: [PATCH] MCOL-4425 INSERT..SELECT hangs on cpimport when MCS is installed in a non-default path Using absolute path when building cpimport command line for execvp(). --- mcsconfig.h.in | 2 ++ writeengine/splitter/we_cmdargs.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mcsconfig.h.in b/mcsconfig.h.in index 76f17917a..2f7e141b0 100644 --- a/mcsconfig.h.in +++ b/mcsconfig.h.in @@ -390,6 +390,8 @@ #define MCSSBINDIR "${ENGINE_SBINDIR}" +#define MCSBINDIR "${ENGINE_BINDIR}" + #define MCSMYCNFDIR "${MARIADB_MYCNFDIR}" #endif diff --git a/writeengine/splitter/we_cmdargs.cpp b/writeengine/splitter/we_cmdargs.cpp index 30716252c..f54052348 100644 --- a/writeengine/splitter/we_cmdargs.cpp +++ b/writeengine/splitter/we_cmdargs.cpp @@ -43,6 +43,7 @@ using namespace oam; #include "we_cmdargs.h" #include "installdir.h" +#include "mcsconfig.h" namespace WriteEngine { @@ -598,7 +599,7 @@ void WECmdArgs::parseCmdLineArgs(int argc, char** argv) if (argc > 0) - fPrgmName = "cpimport.bin"; //argv[0] is splitter but we need cpimport + fPrgmName = string(MCSBINDIR) + "/" + "cpimport.bin"; //argv[0] is splitter but we need cpimport while ((aCh = getopt(argc, argv, "d:j:w:s:v:l:r:b:e:B:f:q:ihm:E:C:P:I:n:p:c:ST:Ny:K:t:H:g:U:"))