mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 10.5 into 10.6

Browse source
This commit is contained in:
Thirunarayanan Balathandayuthapani 2024-11-08 18:17:15 +05:30
commit 074831ec61
45 changed files with 257 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/innobase/dict/dict0stats.cc
View file

@ -644,6 +644,8 @@ dict_stats_table_clone_create(
UT_LIST_INIT(t->freed_indexes, &dict_index_t::indexes);
#endif /* BTR_CUR_HASH_ADAPT */
t->stats_error_printed = table->stats_error_printed;
for (index = dict_table_get_first_index(table);
index != NULL;
index = dict_table_get_next_index(index)) {
@ -700,6 +702,7 @@ dict_stats_table_clone_create(
idx->stat_defrag_n_page_split = 0;
idx->stat_defrag_n_pages_freed = 0;
idx->stats_error_printed = index->stats_error_printed;
}
ut_d(t->magic_n = DICT_TABLE_MAGIC_N);

23
storage/innobase/handler/ha_innodb.cc
View file

@ -5727,15 +5727,15 @@ innobase_build_v_templ(
}
/** Check consistency between .frm indexes and InnoDB indexes.
@param[in] table table object formed from .frm
@param[in] ib_table InnoDB table definition
@retval true if not errors were found */
static bool
check_index_consistency(const TABLE* table, const dict_table_t* ib_table)
bool
ha_innobase::check_index_consistency(const dict_table_t* ib_table) noexcept
{
ulint mysql_num_index = table->s->keys;
ulint ib_num_index = UT_LIST_GET_LEN(ib_table->indexes);
bool ret = true;
ulint last_unique = 0;
/* If there exists inconsistency between MySQL and InnoDB dictionary
(metadata) information, the number of index defined in MySQL
@ -5770,8 +5770,21 @@ check_index_consistency(const TABLE* table, const dict_table_t* ib_table)
ret = false;
goto func_exit;
}
}
if (index->is_unique()) {
ulint i = 0;
while ((index = UT_LIST_GET_PREV(indexes, index))) i++;
/* Check if any unique index in InnoDB
dictionary are re-ordered compared to
the index in .frm */
if (last_unique > i) {
m_int_table_flags
|= HA_DUPLICATE_KEY_NOT_IN_ORDER;
}
last_unique = i;
}
}
func_exit:
return ret;
}
@ -6011,7 +6024,7 @@ ha_innobase::open(const char* name, int, uint)
ib_table->lock_mutex_unlock();
}
if (!check_index_consistency(table, ib_table)) {
if (!check_index_consistency(ib_table)) {
sql_print_error("InnoDB indexes are inconsistent with what "
"defined in .frm for table %s",
name);

6
storage/innobase/handler/ha_innodb.h
View file

@ -439,6 +439,12 @@ public:
const KEY_PART_INFO& old_part,
const KEY_PART_INFO& new_part) const override;
/** Check consistency between .frm indexes and InnoDB indexes
Set HA_DUPLICATE_KEY_NOT_IN_ORDER if multiple unique index
are not in the correct order.
@param ib_table InnoDB table definition
@retval true if not errors were found */
bool check_index_consistency(const dict_table_t* ib_table) noexcept;
protected:
bool
can_convert_string(const Field_string* field,