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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-09 08:50:33 +02:00
parent d8d6e99528 47ab793d71
commit 9c18b96603
46 changed files with 1536 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/ha_partition.cc
View File

@@ -11051,11 +11051,8 @@ int ha_partition::check_misplaced_rows(uint read_part_id, bool do_repair)
read_part_id != m_part_info->vers_info->now_part->id &&
!m_part_info->vers_info->interval.is_set())
{
print_admin_msg(ha_thd(), MYSQL_ERRMSG_SIZE, "note",
table_share->db.str, table->alias,
opt_op_name[CHECK_PARTS],
"Not supported for non-INTERVAL history partitions");
DBUG_RETURN(HA_ADMIN_NOT_IMPLEMENTED);
/* Skip this check as it is not supported for non-INTERVAL history partitions. */
DBUG_RETURN(HA_ADMIN_OK);
}
if (do_repair)