Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä
2021-04-21 09:01:01 +03:00
163 changed files with 8191 additions and 3352 deletions

View File

@ -1795,9 +1795,10 @@ ret_sign:
{
if (negative)
{
if (ull > (ulonglong) LONGLONG_MIN)
if (ull >= (ulonglong) LONGLONG_MIN)
{
*error= MY_ERRNO_ERANGE;
if (ull != (ulonglong) LONGLONG_MIN)
*error= MY_ERRNO_ERANGE;
return (ulonglong) LONGLONG_MIN;
}
*error= 0;