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

@@ -26,6 +26,7 @@
#include <netdb.h>
extern int h_errno;
#include "columnstoreversion.h"
#include "mcsadmin.h"
#include "boost/filesystem/operations.hpp"
#include "boost/filesystem/path.hpp"
@@ -5046,21 +5047,15 @@ int processCommand(string* arguments)
if (WEXITSTATUS(rtnCode) == 0)
system("cat /tmp/columnstore.txt");
else {
SystemSoftware systemsoftware;
oam.getSystemSoftware(systemsoftware);
cout << "SoftwareVersion = " << systemsoftware.Version << endl;
cout << "SoftwareRelease = " << systemsoftware.Release << endl;
cout << "SoftwareVersion = " << columnstore_version << endl;
cout << "SoftwareRelease = " << columnstore_release << endl;
}
}
}
else
{
SystemSoftware systemsoftware;
oam.getSystemSoftware(systemsoftware);
cout << "SoftwareVersion = " << systemsoftware.Version << endl;
cout << "SoftwareRelease = " << systemsoftware.Release << endl;
cout << "SoftwareVersion = " << columnstore_version << endl;
cout << "SoftwareRelease = " << columnstore_release << endl;
}
cout << endl;
break;