diff options
| -rwxr-xr-x | debian/autobake-deb.sh | 2 | ||||
| -rw-r--r-- | debian/mariadb-columnstore-libs.install | 35 | ||||
| -rw-r--r-- | debian/mariadb-columnstore-platform.install | 106 | ||||
| -rw-r--r-- | debian/mariadb-plugin-columnstore.install | 144 | ||||
| -rw-r--r-- | debian/mariadb-plugin-columnstore.postinst | 9 | ||||
| -rw-r--r-- | debian/mariadb-plugin-columnstore.postrm | 8 | ||||
| -rw-r--r-- | debian/mariadb-plugin-columnstore.prerm | 6 |
7 files changed, 167 insertions, 143 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 90c133a1e4b..27a5def0792 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -98,8 +98,6 @@ fi if [[ $CMAKEFLAGS != *"COLUMNSTORE=YES"* ]] then sed -i -e "/Package: mariadb-plugin-columnstore/,/^$/d" debian/control - sed -i -e "/Package: mariadb-columnstore-libs/,/^$/d" debian/control - sed -i -e "/Package: mariadb-columnstore-platform/,/^$/d" debian/control fi # Adjust changelog, add new version diff --git a/debian/mariadb-columnstore-libs.install b/debian/mariadb-columnstore-libs.install deleted file mode 100644 index 9118c897f71..00000000000 --- a/debian/mariadb-columnstore-libs.install +++ /dev/null @@ -1,35 +0,0 @@ -usr/lib/x86_64-linux-gnu/libalarmmanager.so -usr/lib/x86_64-linux-gnu/libbatchloader.so -usr/lib/x86_64-linux-gnu/libbrm.so -usr/lib/x86_64-linux-gnu/libcacheutils.so -usr/lib/x86_64-linux-gnu/libcloudio.so -usr/lib/x86_64-linux-gnu/libcommon.so -usr/lib/x86_64-linux-gnu/libcompress.so -usr/lib/x86_64-linux-gnu/libconfigcpp.so -usr/lib/x86_64-linux-gnu/libdataconvert.so -usr/lib/x86_64-linux-gnu/libddlcleanuputil.so -usr/lib/x86_64-linux-gnu/libddlpackage.so -usr/lib/x86_64-linux-gnu/libddlpackageproc.so -usr/lib/x86_64-linux-gnu/libdmlpackage.so -usr/lib/x86_64-linux-gnu/libdmlpackageproc.so -usr/lib/x86_64-linux-gnu/libexecplan.so -usr/lib/x86_64-linux-gnu/libfuncexp.so -usr/lib/x86_64-linux-gnu/libidbdatafile.so -usr/lib/x86_64-linux-gnu/libjoblist.so -usr/lib/x86_64-linux-gnu/libjoiner.so -usr/lib/x86_64-linux-gnu/liblibmysql_client.so -usr/lib/x86_64-linux-gnu/libloggingcpp.so -usr/lib/x86_64-linux-gnu/libmessageqcpp.so -usr/lib/x86_64-linux-gnu/liboamcpp.so -usr/lib/x86_64-linux-gnu/libquerystats.so -usr/lib/x86_64-linux-gnu/libquerytele.so -usr/lib/x86_64-linux-gnu/libregr.so -usr/lib/x86_64-linux-gnu/librowgroup.so -usr/lib/x86_64-linux-gnu/librwlock.so -usr/lib/x86_64-linux-gnu/libthreadpool.so -usr/lib/x86_64-linux-gnu/libthrift.so -usr/lib/x86_64-linux-gnu/libudfsdk.so -usr/lib/x86_64-linux-gnu/libwindowfunction.so -usr/lib/x86_64-linux-gnu/libwriteengine.so -usr/lib/x86_64-linux-gnu/libwriteengineclient.so -usr/lib/x86_64-linux-gnu/libwriteengineredistribute.so diff --git a/debian/mariadb-columnstore-platform.install b/debian/mariadb-columnstore-platform.install deleted file mode 100644 index 5382c6e6e6f..00000000000 --- a/debian/mariadb-columnstore-platform.install +++ /dev/null @@ -1,106 +0,0 @@ -etc/columnstore/AlarmConfig.xml -etc/columnstore/Columnstore.xml -etc/columnstore/ConsoleCmds.xml -etc/columnstore/ErrorMessage.txt -etc/columnstore/MessageFile.txt -etc/columnstore/ProcessConfig.xml -etc/columnstore/storagemanager.cnf -usr/bin/DDLProc -usr/bin/DMLProc -usr/bin/ExeMgr -usr/bin/MCSInstanceCmds.sh -usr/bin/MCSVolumeCmds.sh -usr/bin/MCSgetCredentials.sh -usr/bin/PrimProc -usr/bin/ProcMgr -usr/bin/ProcMon -usr/bin/ServerMonitor -usr/bin/StorageManager -usr/bin/WriteEngineServer -usr/bin/alarmReport.sh -usr/bin/autoConfigure -usr/bin/bulklogReport.sh -usr/bin/clearShm -usr/bin/cleartablelock -usr/bin/columnstore -usr/bin/columnstore-post-install -usr/bin/columnstore-pre-uninstall -usr/bin/columnstoreClusterTester.sh -usr/bin/columnstoreDBWrite -usr/bin/columnstoreSupport -usr/bin/columnstoreSyslogSetup.sh -usr/bin/columnstore_installer -usr/bin/columnstore_module_installer.sh -usr/bin/columnstore_os_check.sh -usr/bin/columnstore_run.sh -usr/bin/colxml -usr/bin/configReport.sh -usr/bin/configxml.sh -usr/bin/controllernode -usr/bin/cpimport -usr/bin/cpimport.bin -usr/bin/cplogger -usr/bin/dbbuilder -usr/bin/dbrmctl -usr/bin/ddlcleanup -usr/bin/disable-rep-columnstore.sh -usr/bin/editem -usr/bin/getMySQLpw -usr/bin/hardwareReport.sh -usr/bin/idbmeminfo -usr/bin/load_brm -usr/bin/logReport.sh -usr/bin/mariadb-command-line.sh -usr/bin/master-rep-columnstore.sh -usr/bin/mcsGetConfig -usr/bin/mcsSetConfig -usr/bin/mcs_module_installer.sh -usr/bin/mcsadmin -usr/bin/mycnfUpgrade -usr/bin/os_detect.sh -usr/bin/post-mysql-install -usr/bin/post-mysqld-install -usr/bin/postConfigure -usr/bin/quick_installer_amazon.sh -usr/bin/quick_installer_multi_server.sh -usr/bin/quick_installer_single_server.sh -usr/bin/remote_command.sh -usr/bin/remote_command_verify.sh -usr/bin/remote_scp_get.sh -usr/bin/remote_scp_put.sh -usr/bin/remotessh.exp -usr/bin/reset_locks -usr/bin/resourceReport.sh -usr/bin/rollback -usr/bin/rsync.sh -usr/bin/save_brm -usr/bin/slave-rep-columnstore.sh -usr/bin/smcat -usr/bin/smls -usr/bin/smput -usr/bin/smrm -usr/bin/softwareReport.sh -usr/bin/startupTests.sh -usr/bin/viewtablelock -usr/bin/workernode -usr/lib/x86_64-linux-gnu/libmarias3.so -usr/lib/x86_64-linux-gnu/libmarias3.so.3 -usr/lib/x86_64-linux-gnu/libmarias3.so.3.1.2 -usr/lib/x86_64-linux-gnu/libstoragemanager.so -usr/share/columnstore/columnstore.service -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_functions -usr/share/columnstore/gitversionEngine -usr/share/columnstore/mcstest-001.sh -usr/share/columnstore/mcstest-002.sh -usr/share/columnstore/mcstest-003.sh -usr/share/columnstore/mcstest-004.sh -usr/share/columnstore/myCnf-exclude-args.text -usr/share/columnstore/myCnf-include-args.text -usr/share/columnstore/releasenum -var/lib/columnstore/local/module - diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install index 16838cddbdd..ec0204f57ea 100644 --- a/debian/mariadb-plugin-columnstore.install +++ b/debian/mariadb-plugin-columnstore.install @@ -9,3 +9,147 @@ usr/share/columnstore/calshowprocesslist.sql usr/share/columnstore/columnstore_info.sql usr/share/columnstore/dumpcat_mysql.sql usr/share/columnstore/syscatalog_mysql.sql +usr/lib/x86_64-linux-gnu/libalarmmanager.so +usr/lib/x86_64-linux-gnu/libbatchloader.so +usr/lib/x86_64-linux-gnu/libbrm.so +usr/lib/x86_64-linux-gnu/libcacheutils.so +usr/lib/x86_64-linux-gnu/libcloudio.so +usr/lib/x86_64-linux-gnu/libcommon.so +usr/lib/x86_64-linux-gnu/libcompress.so +usr/lib/x86_64-linux-gnu/libconfigcpp.so +usr/lib/x86_64-linux-gnu/libdataconvert.so +usr/lib/x86_64-linux-gnu/libddlcleanuputil.so +usr/lib/x86_64-linux-gnu/libddlpackage.so +usr/lib/x86_64-linux-gnu/libddlpackageproc.so +usr/lib/x86_64-linux-gnu/libdmlpackage.so +usr/lib/x86_64-linux-gnu/libdmlpackageproc.so +usr/lib/x86_64-linux-gnu/libexecplan.so +usr/lib/x86_64-linux-gnu/libfuncexp.so +usr/lib/x86_64-linux-gnu/libidbdatafile.so +usr/lib/x86_64-linux-gnu/libjoblist.so +usr/lib/x86_64-linux-gnu/libjoiner.so +usr/lib/x86_64-linux-gnu/liblibmysql_client.so +usr/lib/x86_64-linux-gnu/libloggingcpp.so +usr/lib/x86_64-linux-gnu/libmessageqcpp.so +usr/lib/x86_64-linux-gnu/liboamcpp.so +usr/lib/x86_64-linux-gnu/libquerystats.so +usr/lib/x86_64-linux-gnu/libquerytele.so +usr/lib/x86_64-linux-gnu/libregr.so +usr/lib/x86_64-linux-gnu/librowgroup.so +usr/lib/x86_64-linux-gnu/librwlock.so +usr/lib/x86_64-linux-gnu/libthreadpool.so +usr/lib/x86_64-linux-gnu/libthrift.so +usr/lib/x86_64-linux-gnu/libudfsdk.so +usr/lib/x86_64-linux-gnu/libwindowfunction.so +usr/lib/x86_64-linux-gnu/libwriteengine.so +usr/lib/x86_64-linux-gnu/libwriteengineclient.so +usr/lib/x86_64-linux-gnu/libwriteengineredistribute.so +etc/columnstore/AlarmConfig.xml +etc/columnstore/Columnstore.xml +etc/columnstore/ConsoleCmds.xml +etc/columnstore/ErrorMessage.txt +etc/columnstore/MessageFile.txt +etc/columnstore/ProcessConfig.xml +etc/columnstore/storagemanager.cnf +usr/bin/DDLProc +usr/bin/DMLProc +usr/bin/ExeMgr +usr/bin/MCSInstanceCmds.sh +usr/bin/MCSVolumeCmds.sh +usr/bin/MCSgetCredentials.sh +usr/bin/PrimProc +usr/bin/ProcMgr +usr/bin/ProcMon +usr/bin/ServerMonitor +usr/bin/StorageManager +usr/bin/WriteEngineServer +usr/bin/alarmReport.sh +usr/bin/autoConfigure +usr/bin/bulklogReport.sh +usr/bin/clearShm +usr/bin/cleartablelock +usr/bin/columnstore +usr/bin/columnstore-post-install +usr/bin/columnstore-pre-uninstall +usr/bin/columnstoreClusterTester.sh +usr/bin/columnstoreDBWrite +usr/bin/columnstoreSupport +usr/bin/columnstoreSyslogSetup.sh +usr/bin/columnstore_installer +usr/bin/columnstore_module_installer.sh +usr/bin/columnstore_os_check.sh +usr/bin/columnstore_run.sh +usr/bin/colxml +usr/bin/configReport.sh +usr/bin/configxml.sh +usr/bin/controllernode +usr/bin/cpimport +usr/bin/cpimport.bin +usr/bin/cplogger +usr/bin/dbbuilder +usr/bin/dbrmctl +usr/bin/ddlcleanup +usr/bin/disable-rep-columnstore.sh +usr/bin/editem +usr/bin/getMySQLpw +usr/bin/hardwareReport.sh +usr/bin/idbmeminfo +usr/bin/load_brm +usr/bin/logReport.sh +usr/bin/mariadb-command-line.sh +usr/bin/master-rep-columnstore.sh +usr/bin/mcsGetConfig +usr/bin/mcsSetConfig +usr/bin/mcs_module_installer.sh +usr/bin/mycnfUpgrade +usr/bin/os_detect.sh +usr/bin/post-mysql-install +usr/bin/post-mysqld-install +usr/bin/postConfigure +usr/bin/quick_installer_multi_server.sh +usr/bin/quick_installer_single_server.sh +usr/bin/remote_command.sh +usr/bin/remote_command_verify.sh +usr/bin/remote_scp_get.sh +usr/bin/remote_scp_put.sh +usr/bin/remotessh.exp +usr/bin/reset_locks +usr/bin/resourceReport.sh +usr/bin/rollback +usr/bin/rsync.sh +usr/bin/save_brm +usr/bin/slave-rep-columnstore.sh +usr/bin/smcat +usr/bin/smls +usr/bin/smput +usr/bin/smrm +usr/bin/softwareReport.sh +usr/bin/startupTests.sh +usr/bin/viewtablelock +usr/bin/workernode +usr/lib/x86_64-linux-gnu/libmarias3.so +usr/lib/x86_64-linux-gnu/libstoragemanager.so +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_functions +usr/share/columnstore/gitversionEngine +usr/share/columnstore/mcstest-001.sh +usr/share/columnstore/mcstest-002.sh +usr/share/columnstore/mcstest-003.sh +usr/share/columnstore/mcstest-004.sh +usr/share/columnstore/myCnf-exclude-args.text +usr/share/columnstore/myCnf-include-args.text +usr/share/columnstore/releasenum +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-workernode.service +usr/share/columnstore/mcs-writeengineserver.service +var/lib/columnstore/local/module diff --git a/debian/mariadb-plugin-columnstore.postinst b/debian/mariadb-plugin-columnstore.postinst new file mode 100644 index 00000000000..06d6542527f --- /dev/null +++ b/debian/mariadb-plugin-columnstore.postinst @@ -0,0 +1,9 @@ +#!/bin/bash -e + +rpmmode=install + +columnstore-post-install --rpmmode=$rpmmode + +echo "MariaDB ColumnStore install completed" + +exit 0 diff --git a/debian/mariadb-plugin-columnstore.postrm b/debian/mariadb-plugin-columnstore.postrm new file mode 100644 index 00000000000..d7476c10656 --- /dev/null +++ b/debian/mariadb-plugin-columnstore.postrm @@ -0,0 +1,8 @@ +#!/bin/bash -e + +if [ "$1" = "purge" ]; then + rm -rf /var/lib/columnstore + rm -f /etc/rsyslog.d/49-columnstore.conf + rm -rf /etc/columnstore +fi + diff --git a/debian/mariadb-plugin-columnstore.prerm b/debian/mariadb-plugin-columnstore.prerm new file mode 100644 index 00000000000..260f520783b --- /dev/null +++ b/debian/mariadb-plugin-columnstore.prerm @@ -0,0 +1,6 @@ +#!/bin/bash -e + +columnstore-pre-uninstall + +exit 0 + |