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

Remove windows ifdefs

Browse Source
This commit is contained in:
Leonid Fedorov
2023-03-02 15:59:42 +00:00
parent 123c345b40
commit 56f2346083
328 changed files with 9 additions and 19602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
writeengine/bulk/we_bulkload.cpp
View File

@ -1364,12 +1364,7 @@ int BulkLoad::buildImportDataFileList(const std::string& location, const std::st
for (str = filenames;; str = NULL)
{
#ifdef _MSC_VER
// On Windows, only comma and vertbar can separate input files
token = strtok(str, ",|");
#else
token = strtok(str, ", |");
#endif
if (token == NULL)
break;
@ -1389,9 +1384,6 @@ int BulkLoad::buildImportDataFileList(const std::string& location, const std::st
fullPath += token;
}
#ifdef _MSC_VER
loadFiles.push_back(fullPath);
#else
// If running mode2, then support a filename with wildcards
if (fBulkMode == BULK_MODE_REMOTE_MULTIPLE_SRC)
@ -1476,7 +1468,6 @@ int BulkLoad::buildImportDataFileList(const std::string& location, const std::st
loadFiles.push_back(fullPath);
} // not mode2
#endif
} // loop through filename tokens
delete[] filenames;