database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-02 17:22:27 +03:00
Code Activity

Merge branch 'develop-1.1' into develop

Browse Source
This commit is contained in:
Andrew Hutchings
2017-10-30 10:29:30 +00:00
parent f6060a2b9a 0139ae1745
commit a347a8f5aa
10 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/windowfunction/wf_lead_lag.cpp
View File

@ -128,7 +128,7 @@ void WF_lead_lag<T>::parseParms(const std::vector<execplan::SRCP>& parms)
fLead = 1;
fRespectNulls = true;
fDefNull = false;
fDefault = (T)0;
// fDefault = (T)0; // Won't work for std::string. Default should always be set below.
fOffsetNull = false;
fOffset = 0;

6
utils/windowfunction/windowfunctiontype.cpp
View File

@ -538,8 +538,8 @@ void* WindowFunctionType::getNullValueByType(int ct, int pos)
case CalpontSystemCatalog::CHAR:
case CalpontSystemCatalog::VARCHAR:
{
uint64_t len = fRow.getColumnWidth(pos);
// uint64_t len = fRow.getColumnWidth(pos);
#if 0
switch (len)
{
case 1:
@ -567,6 +567,8 @@ void* WindowFunctionType::getNullValueByType(int ct, int pos)
break;
}
#endif
v = &stringNull;
break;
}