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.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-09 09:40:29 +02:00
parent 662fe08232 ba4f8e317d
commit 06988bdcaa
60 changed files with 1773 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/ha_partition.cc
View File

@@ -1203,7 +1203,6 @@ static const LEX_CSTRING opt_op_name[]=
};
static const LEX_CSTRING msg_note= { STRING_WITH_LEN("note") };
static const LEX_CSTRING msg_warning= { STRING_WITH_LEN("warning") };
#define msg_error error_clex_str
@@ -11068,11 +11067,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, &msg_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)