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 pull request #1010 from tntnatbry/MCOL-3680

Browse Source 
MCOL-3680 mysqld will abort if Columnstore.xml is missing.
Conflicts:
	dbcon/mysql/ha_mcs.cpp
This commit is contained in:
Andrew Hutchings
2020-01-28 15:26:05 +00:00
committed by Patrick LeBlanc
parent b72a9784ba
commit 9e588039d5
4 changed files with 278 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/configcpp/configcpp.cpp
View File

@ -114,19 +114,17 @@ Config* Config::makeConfig(const char* cf)
Config::Config(const string& configFile) :
fDoc(0), fConfigFile(configFile), fMtime(0), fParser()
{
for ( int i = 0 ; i < 20 ; i++ )
int i = 0;
for ( ; i < 2 ; i++ )
{
if (access(fConfigFile.c_str(), R_OK) != 0)
{
if ( i >= 15 )
throw runtime_error("Config::Config: error accessing config file " + fConfigFile);
sleep (1);
}
else
if (access(fConfigFile.c_str(), R_OK) == 0)
break;
sleep (1);
}
if ( i == 2 )
throw runtime_error("Config::Config: error accessing config file " + fConfigFile);
struct stat statbuf;
if (stat(configFile.c_str(), &statbuf) == 0)