From 4a389f937d1171e123ef10e50091750fc50b6fd0 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 6 Apr 2021 06:58:09 +0400 Subject: [PATCH] MCOL-4669 Syslog does not setup if compiled with CMAKE_INSTALL_PREFIX --- oam/install_scripts/columnstore-post-install.in | 2 +- oam/install_scripts/columnstoreSyslogSetup.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in index 7f523cf81..11ac23ca4 100755 --- a/oam/install_scripts/columnstore-post-install.in +++ b/oam/install_scripts/columnstore-post-install.in @@ -203,7 +203,7 @@ if [ $user = "root" ]; then fi if [ $user = "root" ]; then - columnstoreSyslogSetup.sh install > $installLogDir/syslog_install.log 2>&1 + @ENGINE_BINDIR@/columnstoreSyslogSetup.sh install > $installLogDir/syslog_install.log 2>&1 #check if MariaDB Columnstore system logging was setup cat $installLogDir/syslog_install.log | grep 'No System Logging' >/dev/null 2>&1 diff --git a/oam/install_scripts/columnstoreSyslogSetup.sh.in b/oam/install_scripts/columnstoreSyslogSetup.sh.in index 8fada3c29..8b75934a4 100755 --- a/oam/install_scripts/columnstoreSyslogSetup.sh.in +++ b/oam/install_scripts/columnstoreSyslogSetup.sh.in @@ -228,7 +228,7 @@ if [ ! -z "$syslog_conf" ] ; then chmod $CHMOD @ENGINE_LOGDIR@/corefiles chmod $CHMOD @ENGINE_LOGDIR@/trace - cplogger -i 19 "***** MariaDB Columnstore Installed *****" + @ENGINE_BINDIR@/cplogger -i 19 "***** MariaDB Columnstore Installed *****" if [ -f @ENGINE_LOGDIR@/info.log ]; then if [ -s @ENGINE_LOGDIR@/info.log ]; then