fix a bad merge in ec62f46a

debian/mariadb-plugin-columnstore.install

-etc/columnstore/Columnstore.xml
-etc/columnstore/ErrorMessage.txt
-etc/columnstore/MessageFile.txt
-etc/columnstore/storagemanager.cnf
-etc/mysql/mariadb.conf.d/columnstore.cnf
-usr/bin/mcsRebuildEM
-usr/bin/DDLProc
-usr/bin/DMLProc
-usr/bin/ExeMgr
-usr/bin/PrimProc
-usr/bin/StorageManager
-usr/bin/WriteEngineServer
-usr/bin/clearShm
-usr/bin/cleartablelock
-usr/bin/columnstore-post-install
-usr/bin/columnstore-pre-uninstall
-usr/bin/columnstoreDBWrite
-usr/bin/columnstoreSyslogSetup.sh
-usr/bin/columnstore_run.sh
-usr/bin/colxml
-usr/bin/controllernode
-usr/bin/cpimport
-usr/bin/cpimport.bin
-usr/bin/cplogger
-usr/bin/cspasswd
-usr/bin/cskeys
-usr/bin/dbbuilder
-usr/bin/dbrmctl
-usr/bin/ddlcleanup
-usr/bin/editem
-usr/bin/idbmeminfo
-usr/bin/load_brm
-usr/bin/mariadb-columnstore-start.sh
-usr/bin/mariadb-columnstore-stop.sh
-usr/bin/mcs-savebrm.py
-usr/bin/mcs-loadbrm.py
-usr/bin/mcs-stop-controllernode.sh
-usr/bin/mcsGetConfig
-usr/bin/mcsSetConfig
-usr/bin/mycnfUpgrade
-usr/bin/post-mysql-install
-usr/bin/post-mysqld-install
-usr/bin/reset_locks
-usr/bin/rollback
-usr/bin/save_brm
-usr/bin/smcat
-usr/bin/smls
-usr/bin/smput
-usr/bin/smrm
-usr/bin/testS3Connection
-usr/bin/viewtablelock
-usr/bin/workernode
-usr/lib/*/libbatchloader.so
-usr/lib/*/libbrm.so
-usr/lib/*/libcacheutils.so
-usr/lib/*/libcloudio.so
-usr/lib/*/libcommon.so
-usr/lib/*/libcompress.so
-usr/lib/*/libconfigcpp.so
-usr/lib/*/libdataconvert.so
-usr/lib/*/libddlcleanuputil.so
-usr/lib/*/libddlpackage.so
-usr/lib/*/libddlpackageproc.so
-usr/lib/*/libdmlpackage.so
-usr/lib/*/libdmlpackageproc.so
-usr/lib/*/libexecplan.so
-usr/lib/*/libfuncexp.so
-usr/lib/*/libidbdatafile.so
-usr/lib/*/libjoblist.so
-usr/lib/*/libjoiner.so
-usr/lib/*/liblibmysql_client.so
-usr/lib/*/libloggingcpp.so
-usr/lib/*/libmarias3.so
-usr/lib/*/libmessageqcpp.so
-usr/lib/*/liboamcpp.so
-usr/lib/*/libquerystats.so
-usr/lib/*/libquerytele.so
-usr/lib/*/libregr.so
-usr/lib/*/librowgroup.so
-usr/lib/*/librwlock.so
-usr/lib/*/libstoragemanager.so
-usr/lib/*/libthreadpool.so
-usr/lib/*/libthrift.so
-usr/lib/*/libudfsdk.so
-usr/lib/*/libwindowfunction.so
-usr/lib/*/libwriteengine.so
-usr/lib/*/libwriteengineclient.so
-usr/lib/*/libwriteengineredistribute.so
-usr/lib/*/libdatatypes.so
-usr/lib/mysql/plugin/ha_columnstore.so
-usr/lib/mysql/plugin/libregr_mysql.so
-usr/lib/mysql/plugin/libudf_mysql.so
-usr/sbin/install_mcs_mysql.sh
-usr/share/columnstore/calremoveuserpriority.sql
-usr/share/columnstore/calsetuserpriority.sql
-usr/share/columnstore/calshowprocesslist.sql
-usr/share/columnstore/columnstoreAlias
-usr/share/columnstore/columnstoreLogRotate
-usr/share/columnstore/columnstoreSyslog
-usr/share/columnstore/columnstoreSyslog-ng
-usr/share/columnstore/columnstoreSyslog7
-usr/share/columnstore/columnstore_info.sql
-usr/share/columnstore/dumpcat_mysql.sql
-usr/share/columnstore/gitversionEngine
-usr/share/columnstore/mariadb-columnstore.service
-usr/share/columnstore/mcs-controllernode.service
-usr/share/columnstore/mcs-ddlproc.service
-usr/share/columnstore/mcs-dmlproc.service
-usr/share/columnstore/mcs-exemgr.service
-usr/share/columnstore/mcs-loadbrm.service
-usr/share/columnstore/mcs-primproc.service
-usr/share/columnstore/mcs-storagemanager.service
-usr/share/columnstore/mcs-workernode.service
-usr/share/columnstore/mcs-writeengineserver.service
-usr/share/columnstore/myCnf-exclude-args.text
-usr/share/columnstore/myCnf-include-args.text
-usr/share/columnstore/releasenum
-usr/share/columnstore/syscatalog_mysql.sql
-var/lib/columnstore/local/module

debian/mariadb-plugin-columnstore.postinst

-#!/bin/bash
-
-set -e
-
-# Install ColumnStore
-columnstore-post-install install
-
-#DEBHELPER#

debian/mariadb-plugin-columnstore.postrm

-#!/bin/bash
-
-set -e
-
-if [ "$1" = "purge" ]; then
-    rm -rf /var/lib/columnstore
-    rm -rf /etc/columnstore
-    rm -f /etc/mysql/mariadb.conf.d/columnstore.cnf.rpmsave
-fi
-
-# Automatically restart MariaDB after ColumnStore plugin has been removed
-case "$1" in
-  purge|remove|disappear)
-    if [ -d /run/systemd/system ]; then
-      # If systemd
-      deb-systemd-invoke restart mariadb.service >/dev/null
-    elif [ -x "/etc/init.d/mariadb" ]; then
-      # Fall-back to SysV init
-      invoke-rc.d mariadb restart || exit $?
-    fi
-  ;;
-esac
-
-#DEBHELPER#

debian/mariadb-plugin-columnstore.prerm

-#!/bin/bash
-
-set -e
-
-columnstore-pre-uninstall
-
-
-#DEBHELPER#

debian/mariadb-plugin-columnstore.triggers

-activate-noawait ldconfig