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

Fix merge issues

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 14:18:11 +01:00
parent 020b211bb7
commit e3fe883a9c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
exemgr/main.cpp
View File

@ -1298,7 +1298,7 @@ void setupSignalHandlers()
#endif
}
void setupCwd(joblist::ResourceManager* rm)
int8_t setupCwd(joblist::ResourceManager* rm)
{
std::string workdir = rm->getScWorkingDir();
int8_t rc = chdir(workdir.c_str());

2
utils/udfsdk/mcsv1_udaf.h
View File

@ -1029,7 +1029,7 @@ inline T mcsv1_UDAF::convertAnyTo(static_any::any& valIn)
}
else
{
throw runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type");
throw std::runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type");
}
return val;
}