mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-32891 Assertion `value <= ((ulonglong) 0xFFFFFFFFL) * 10000ULL' failed in str_to_DDhhmmssff_internal

Browse source 
Fixing the wrong assert.
This commit is contained in:
Alexander Barkov 2024-09-20 15:07:39 +04:00
parent 607fc15393
commit 681609d8a0
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/main/func_extract.result
View file

@ -1470,5 +1470,13 @@ DROP FUNCTION params;
DROP FUNCTION select01; DROP FUNCTION select01;
DROP FUNCTION select02; DROP FUNCTION select02;
# #
# MDEV-32891 Assertion `value <= ((ulonglong) 0xFFFFFFFFL) * 10000ULL' failed in str_to_DDhhmmssff_internal
#
SELECT EXTRACT(HOUR_MICROSECOND FROM '42949672955000x1');
EXTRACT(HOUR_MICROSECOND FROM '42949672955000x1')
NULL
Warnings:
Warning 1292 Incorrect interval value: '42949672955000x1'
#
# End of 10.5 tests # End of 10.5 tests
# #

7
mysql-test/main/func_extract.test
View file

@ -511,6 +511,13 @@ DROP FUNCTION params;
DROP FUNCTION select01; DROP FUNCTION select01;
DROP FUNCTION select02; DROP FUNCTION select02;
--echo #
--echo # MDEV-32891 Assertion `value <= ((ulonglong) 0xFFFFFFFFL) * 10000ULL' failed in str_to_DDhhmmssff_internal
--echo #
SELECT EXTRACT(HOUR_MICROSECOND FROM '42949672955000x1');
--echo # --echo #
--echo # End of 10.5 tests --echo # End of 10.5 tests
--echo # --echo #

2
sql-common/my_time.c
View file

@ -961,7 +961,7 @@ str_to_DDhhmmssff_internal(my_bool neg, const char *str, size_t length,
{ {
/* String given as one number; assume HHMMSS format */ /* String given as one number; assume HHMMSS format */
date[0]= 0; date[0]= 0;
DBUG_ASSERT(value <= ((ulonglong) UINT_MAX32) * 10000ULL); DBUG_ASSERT(value / 10000 <= ((ulonglong) UINT_MAX32));
date[1]= (ulong) (value/10000); date[1]= (ulong) (value/10000);
date[2]= (ulong) (value/100 % 100); date[2]= (ulong) (value/100 % 100);
date[3]= (ulong) (value % 100); date[3]= (ulong) (value % 100);