diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2019-12-02 12:51:53 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2019-12-02 12:51:53 +0300 |
| commit | 0b8b11b0b15f2d3d20dc801e50fa2beedc080dad (patch) | |
| tree | 7a7b9f8ec419bff57b3b0258293d91f180908037 /sql/ha_partition.cc | |
| parent | 1d46923a0f6508d52d7ce679a7dd8e7e0e957ae4 (diff) | |
| parent | db32d9457edbcb23b45f433cfcdfc5d86232bbb0 (diff) | |
| download | mariadb-git-0b8b11b0b15f2d3d20dc801e50fa2beedc080dad.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index d4d411f1ad3..c9e12f861af 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -10830,8 +10830,8 @@ int ha_partition::indexes_are_disabled(void) @param repair If true, move misplaced rows to correct partition. @return Operation status. - @retval 0 Success - @retval != 0 Error + @retval HA_ADMIN_OK Success + @retval != HA_ADMIN_OK Error */ int ha_partition::check_misplaced_rows(uint read_part_id, bool do_repair) @@ -10845,6 +10845,17 @@ int ha_partition::check_misplaced_rows(uint read_part_id, bool do_repair) DBUG_ASSERT(m_file); + if (m_part_info->vers_info && + 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); + } + if (do_repair) { /* We must read the full row, if we need to move it! */ |