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

Merge branch 'develop-1.2' into develop-merge-up-20190729

Browse Source
This commit is contained in:
Andrew Hutchings
2019-07-29 12:19:26 +01:00
parent d30745d37c 106250cbf0
commit 811909aa72
36 changed files with 366 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/funcexp/func_timediff.cpp
View File

@ -118,7 +118,10 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::TIME:
case execplan::CalpontSystemCatalog::DATETIME:
if (type1 != type2)
// Diff between time and datetime returns NULL in MariaDB
if ((type2 == execplan::CalpontSystemCatalog::TIME ||
type2 == execplan::CalpontSystemCatalog::DATETIME) &&
type1 != type2)
{
isNull = true;
break;