database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop-1.2' into develop-merge-up-20190514

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 13:58:33 +01:00
parent 6c4afdf18b 0dd33c6f75
commit 020b211bb7
83 changed files with 469 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configMgt/autoInstaller.cpp
View File

@ -637,7 +637,7 @@ int main(int argc, char* argv[])
// Columnstore.xml found
//try to parse it
Config* sysConfigOld;
//Config* sysConfigOld;
ofstream file("/dev/null");
@ -649,7 +649,7 @@ int main(int argc, char* argv[])
// redirect cout to /dev/null
cerr.rdbuf(file.rdbuf());
sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml");
//sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml");
// restore cout stream buffer
cerr.rdbuf (strm_buffer);