1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '10.9' into bb-10.9-release

Browse Source
This commit is contained in:
Oleksandr Byelkin 2022-05-20 21:54:21 +02:00
commit 92702430c2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=10 MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=9 MYSQL_VERSION_MINOR=9
MYSQL_VERSION_PATCH=1 MYSQL_VERSION_PATCH=2
SERVER_MATURITY=gamma SERVER_MATURITY=gamma

5
sql/sql_partition.cc
View File

@ -5984,11 +5984,12 @@ the generated partition syntax in a correct manner.
tab_part_info != part_info && part_info->part_type == VERSIONING_PARTITION && tab_part_info != part_info && part_info->part_type == VERSIONING_PARTITION &&
part_info->num_parts == 0) part_info->num_parts == 0)
{ {
if (part_info->vers_info->interval.is_set() && if (part_info->vers_info->interval.is_set() && (
!tab_part_info->vers_info->interval.is_set() ||
/* TODO: equivalent intervals like 1 hour and 60 mins should be considered equal */ /* TODO: equivalent intervals like 1 hour and 60 mins should be considered equal */
memcmp(&part_info->vers_info->interval, memcmp(&part_info->vers_info->interval,
&tab_part_info->vers_info->interval, &tab_part_info->vers_info->interval,
sizeof(Vers_part_info::interval))) sizeof(Vers_part_info::interval))))
{ {
/* If interval is changed we can not do fast alter */ /* If interval is changed we can not do fast alter */
tab_part_info= tab_part_info->get_clone(thd); tab_part_info= tab_part_info->get_clone(thd);