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

MCOL-5 Don't send empty strings in cpimport command line. It confuses cpimport.

Browse Source
This commit is contained in:
David Hall
2016-08-09 11:35:45 -05:00
parent 010d660e5f
commit 8bc7e46905
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -3461,9 +3461,9 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
{ {
v2[i++] = arg; v2[i++] = arg;
} }
for (i = 0; i < v2.size(); ++i) for (unsigned int j = 0; j < i; ++j)
{ {
Cmds.push_back(const_cast<char*>(v2[i].c_str())); Cmds.push_back(const_cast<char*>(v2[j].c_str()));
} }
Cmds.push_back(0); //null terminate Cmds.push_back(0); //null terminate

6
writeengine/server/we_dataloader.cpp
View File

@ -253,10 +253,10 @@ bool WEDataLoader::setupCpimport() // fork the cpimport
{ {
v2[i++] = arg; v2[i++] = arg;
} }
for (i = 0; i < v2.size(); ++i) for (unsigned int j = 0; j < i; ++j)
{ {
Cmds.push_back(const_cast<char*>(v2[i].c_str())); Cmds.push_back(const_cast<char*>(v2[j].c_str()));
} }
Cmds.push_back(0); //null terminate Cmds.push_back(0); //null terminate
//updatePrgmPath(Cmds); //updatePrgmPath(Cmds);

5
writeengine/splitter/we_splitterapp.cpp
View File

@ -459,10 +459,9 @@ void WESplitterApp::invokeCpimport()
//we need something that works on Windows as well as linux //we need something that works on Windows as well as linux
v2[i++] = arg; v2[i++] = arg;
} }
for (i = 0; i < v2.size(); ++i) for (unsigned int j = 0; j < i; ++j)
{ {
//we're going to exec() below, so don't worry about freeing Cmds.push_back(const_cast<char*>(v2[j].c_str()));
Cmds.push_back(const_cast<char*>(v2[i].c_str()));
} }
Cmds.push_back(0); //null terminate Cmds.push_back(0); //null terminate