database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +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

14
dbcon/mysql/is_columnstore_files.cpp
View File

@@ -93,7 +93,19 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th
char oidDirName[WriteEngine::FILE_NAME_SIZE];
char fullFileName[WriteEngine::FILE_NAME_SIZE];
char dbDir[WriteEngine::MAX_DB_DIR_LEVEL][WriteEngine::MAX_DB_DIR_NAME_SIZE];
config::Config* config = config::Config::makeConfig();
config::Config* config;
try
{
config = config::Config::makeConfig();
}
catch (std::runtime_error& e)
{
thd->raise_error_printf(ER_INTERNAL_ERROR, e.what());
return ER_INTERNAL_ERROR;
}
WriteEngine::Config we_config;
off_t fileSize = 0;
off_t compressedFileSize = 0;