database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-06 16:09:29 +03:00
Code Activity

Merge pull request #346 from drrtuy/MCOL-939

Browse Source 
MCOL-939 Moved columnstore version information to columnstoreversion.h for 1.1.X
This commit is contained in:
benthompson15
2017-12-19 13:21:19 -06:00
committed by GitHub
parent a89438c5fe bea47cc657
commit 39a2253ee1
34 changed files with 53 additions and 2125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
oamapps/mcsadmin/mcsadmin.cpp
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;