database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 10:55:08 +03:00
parent 21b20712a3 c6e4ea682c
commit 63913ce5af
519 changed files with 5110 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/func_misc.test
View File

@ -254,6 +254,7 @@ SELECT NAME_CONST('var', 'value') COLLATE latin1_general_cs;
#
# Bug #35848: UUID() returns UUIDs with the wrong time
#
--disable_cursor_protocol
select @@session.time_zone into @save_tz;
# make sure all times are UTC so the DayNr won't differ
@ -265,6 +266,7 @@ select 24 * 60 * 60 * 1000 * 1000 * 10 into @my_uuid_one_day;
select concat('0',mid(@my_uuid,16,3),mid(@my_uuid,10,4),left(@my_uuid,8)) into @my_uuidate;
select floor(conv(@my_uuidate,16,10)/@my_uuid_one_day) into @my_uuid_date;
select 141427 + datediff(curdate(),'1970-01-01') into @my_uuid_synthetic;
--enable_cursor_protocol
# these should be identical; date part of UUID should be current date
select @my_uuid_date - @my_uuid_synthetic;