database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 14:26:41 +01:00
parent 0dd33c6f75 f3be1db554
commit ee6575b013
8 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/configMgt/autoConfigure.cpp
View File

@ -359,7 +359,19 @@ int main(int argc, char* argv[])
exit(-1);
}
//setup System Language
// WaitPeriod
try
{
string waitPeriod = sysConfigOld->getConfig(SystemSection, "WaitPeriod");
if (waitPeriod.length() > 0)
{
sysConfigNew->setConfig(SystemSection, "WaitPeriod", waitPeriod);
}
}
catch (...)
{ }
//setup System Language
string systemLang = "C";
try