1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-09-09 21:29:28 +03:00

MCOL-939 Moved columnstore version information to columnstoreversion.h for 1.1.X

This commit is contained in:
Roman Nozdrin
2017-12-12 22:53:33 +03:00
parent 2ed4bc2e72
commit bea47cc657
34 changed files with 53 additions and 2125 deletions

View File

@@ -24,6 +24,7 @@
//#define NDEBUG
#include <cassert>
#include "columnstoreversion.h"
#include "processmanager.h"
#include "installdir.h"
#include "dbrm.h"
@@ -4565,12 +4566,12 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
}
if ( packageType == "rpm")
calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.rpm.tar.gz";
calpontPackage = homedir + "/mariadb-columnstore*" + columnstore_version + "-" + columnstore_release + "*.rpm.tar.gz";
else
if ( packageType == "deb")
calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.deb.tar.gz";
calpontPackage = homedir + "/mariadb-columnstore*" + columnstore_version + "-" + columnstore_release + "*.deb.tar.gz";
else
calpontPackage = homedir + "/mariadb-columnstore*" + systemsoftware.Version + "-" + systemsoftware.Release + "*.bin.tar.gz";
calpontPackage = homedir + "/mariadb-columnstore*" + columnstore_version + "-" + columnstore_release + "*.bin.tar.gz";
if ( DistributedInstall == "y" )
{