From 1390372c358579488b2ae4439397dcda0167dde8 Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Tue, 30 Jun 2020 13:02:07 -0400
Subject: [PATCH 1/2] Define a dummy columnstore target when doing a standalone
 build.

---
 dbcon/mysql/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index 9f005ed8a..cbe3bf4ec 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -48,6 +48,9 @@ else ()
     target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
 
     install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine)
+    
+    # define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
+    add_custom_target(columnstore DEPENDS ha_columnstore) 
 endif ()
 
 install(FILES syscatalog_mysql.sql 

From 03338525b7fc3195a6382ffb914bcb117279acd7 Mon Sep 17 00:00:00 2001
From: benthompson15 <ben.thompson.015@gmail.com>
Date: Tue, 30 Jun 2020 15:06:32 -0500
Subject: [PATCH 2/2] MCOL-4120: change pgrep to look for mariadbd instead of
 mysqld

---
 build/postUn_storage_engine.sh                  | 2 +-
 oam/install_scripts/columnstore-post-install.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/postUn_storage_engine.sh b/build/postUn_storage_engine.sh
index 99564f249..40f0c0fde 100644
--- a/build/postUn_storage_engine.sh
+++ b/build/postUn_storage_engine.sh
@@ -16,7 +16,7 @@ else
 fi
 
 if [ $rpmmode = erase ]; then
-    if [ ! -z "$(pgrep -x mysqld)" ];then
+    if [ ! -z "$(pgrep -x mariadbd)" ];then
         systemctl cat mariadb.service > /dev/null 2>&1
         if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
             systemctl restart mariadb.service > /dev/null 2>&1
diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in
index 3e89c4a99..05104ea37 100755
--- a/oam/install_scripts/columnstore-post-install.in
+++ b/oam/install_scripts/columnstore-post-install.in
@@ -68,7 +68,7 @@ user=`whoami 2>/dev/null`
 quiet=0
 
 stop_mysqld=0
-if [ -z "$(pgrep -x mysqld)" ];then
+if [ -z "$(pgrep -x mariadbd)" ];then
 
     # Startup mysqld 
     systemctl cat mariadb.service > /dev/null 2>&1