database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-21 13:40:58 +03:00
Code Activity

Merge pull request #1011 from pleblanc1976/minor-fixes

Browse Source 
Minor fixes
This commit is contained in:
Andrew Hutchings
2020-01-27 12:56:04 +00:00
committed by GitHub
parent 092994d00d dc94725dd5
commit e75891477e
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oamapps/postConfigure/installer.cpp
View File

@@ -713,7 +713,9 @@ int main(int argc, char* argv[])
if (getenv("SKIP_OAM_INIT")) if (getenv("SKIP_OAM_INIT"))
{ {
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; cout << "(2) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
sysConfig->setConfig("Installation", "MySQLRep", "n");
sysConfig->write();
exit(0); exit(0);
} }
@@ -740,7 +742,9 @@ int main(int argc, char* argv[])
if (getenv("SKIP_OAM_INIT")) if (getenv("SKIP_OAM_INIT"))
{ {
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; cout << "(3) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
sysConfig->setConfig("Installation", "MySQLRep", "n");
sysConfig->write();
exit(0); exit(0);
} }

4
oamapps/postConfigure/postConfigure.cpp
View File

@@ -3732,7 +3732,9 @@ int main(int argc, char* argv[])
if (getenv("SKIP_OAM_INIT")) if (getenv("SKIP_OAM_INIT"))
{ {
cout << "SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl; cout << "(1) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
sysConfig->setConfig("Installation", "MySQLRep", "n");
sysConfig->write();
exit(0); exit(0);
} }

1
utils/common/poolallocator.cpp
View File

@@ -68,7 +68,6 @@ void PoolAllocator::newBlock()
void * PoolAllocator::allocOOB(uint64_t size) void * PoolAllocator::allocOOB(uint64_t size)
{ {
bool _false = false;
OOBMemInfo memInfo; OOBMemInfo memInfo;
memUsage += size; memUsage += size;