1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-15 12:09:09 +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

@@ -46,6 +46,7 @@
#include <readline/readline.h>
#include <readline/history.h>
#include "columnstoreversion.h"
#include "liboamcpp.h"
#include "configcpp.h"
#include "alarmmanager.h"
@@ -220,10 +221,7 @@ int main(int argc, char *argv[])
postConfigureLog = true;
}
else if( string("-v") == argv[i] ) {
SystemSoftware systemsoftware;
oam.getSystemSoftware(systemsoftware);
cout << endl << "columnstore Version: " << systemsoftware.Version << "-" << systemsoftware.Release << endl;
cout << "columnstore Version: " << columnstore_version << "-" << columnstore_release << endl;
exit (0);
}
else if( string("-pc") == argv[i] ) {
@@ -1289,10 +1287,7 @@ int main(int argc, char *argv[])
cout << "===== Setting up system '" + systemName + "' based on these settings ===== " << endl << endl;
SystemSoftware systemsoftware;
oam.getSystemSoftware(systemsoftware);
cout << "columnstore Version = " << systemsoftware.Version << "-" << systemsoftware.Release << endl;
cout << "columnstore Version = " << columnstore_version << "-" << columnstore_release << endl;
cout << "System Type = " << systemType << endl;
if ( subnetID != oam::UnassignedName ) {