1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00

Merge fixes.

This commit is contained in:
Roman Nozdrin
2020-06-25 14:16:13 +00:00
parent 8c02802ac1
commit bd0d5af123
5 changed files with 32 additions and 495 deletions

View File

@@ -155,12 +155,12 @@ string Func_char::getStrVal(Row& row,
if (tmpval > static_cast<int128_t>(INT64_MAX))
tmpval = INT64_MAX;
if ( !getChar((int64_t)tmpval, buf) )
// WIP MCOL-641
/*if ( !getChar((int64_t)tmpval, buf) )
{
isNull = true;
return "";
}
}*/
}
else
{
@@ -172,11 +172,12 @@ string Func_char::getStrVal(Row& row,
if ( lefto > 4 )
value++;
if ( !getChar((int64_t)value, buf) )
// WIP MCOL-641
/*if ( !getChar((int64_t)value, buf) )
{
isNull = true;
return "";
}
}*/
}
}
break;