database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '11.2' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-30 09:24:04 +01:00
parent 973e641c32 67c0fd2a41
commit c770bce898
734 changed files with 10187 additions and 4442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sql/handler.cc
View File

@ -3747,6 +3747,28 @@ int handler::ha_rnd_pos(uchar *buf, uchar *pos)
DBUG_RETURN(result);
}
int handler::ha_index_init(uint idx, bool sorted)
{
DBUG_EXECUTE_IF("ha_index_init_fail", return HA_ERR_TABLE_DEF_CHANGED;);
int result;
DBUG_ENTER("ha_index_init");
DBUG_ASSERT(inited==NONE);
if (!(result= index_init(idx, sorted)))
{
inited= INDEX;
active_index= idx;
end_range= NULL;
/*
Do not allow reads from UNIQUE HASH indexes.
*/
DBUG_ASSERT(!(table->key_info[active_index].flags & HA_UNIQUE_HASH));
}
DBUG_RETURN(result);
}
int handler::ha_index_read_map(uchar *buf, const uchar *key,
key_part_map keypart_map,
enum ha_rkey_function find_flag)
@ -7074,7 +7096,7 @@ extern "C" check_result_t handler_index_cond_check(void* h_arg)
return CHECK_OUT_OF_RANGE;
h->increment_statistics(&SSV::ha_icp_attempts);
res= CHECK_NEG;
if (h->pushed_idx_cond->val_int())
if (h->pushed_idx_cond->val_bool())
{
res= CHECK_POS;
h->fast_increment_statistics(&SSV::ha_icp_match);
@ -8576,6 +8598,21 @@ bool Table_scope_and_contents_source_st::vers_fix_system_fields(
}
int get_select_field_pos(Alter_info *alter_info, int select_field_count,
bool versioned)
{
int select_field_pos= alter_info->create_list.elements - select_field_count;
if (select_field_count && versioned &&
/*
ALTER_PARSER_ADD_COLUMN indicates system fields was created implicitly,
select_field_count guarantees it's not ALTER TABLE
*/
alter_info->flags & ALTER_PARSER_ADD_COLUMN)
select_field_pos-= 2;
return select_field_pos;
}
bool Table_scope_and_contents_source_st::vers_check_system_fields(
THD *thd, Alter_info *alter_info, const Lex_table_name &table_name,
const Lex_table_name &db, int select_count)
@ -8589,6 +8626,8 @@ bool Table_scope_and_contents_source_st::vers_check_system_fields(
{
uint fieldnr= 0;
List_iterator<Create_field> field_it(alter_info->create_list);
uint select_field_pos= (uint) get_select_field_pos(alter_info, select_count,
true);
while (Create_field *f= field_it++)
{
/*
@ -8599,7 +8638,7 @@ bool Table_scope_and_contents_source_st::vers_check_system_fields(
SELECT go last there.
*/
bool is_dup= false;
if (fieldnr >= alter_info->create_list.elements - select_count)
if (fieldnr >= select_field_pos && f->invisible < INVISIBLE_SYSTEM)
{
List_iterator<Create_field> dup_it(alter_info->create_list);
for (Create_field *dup= dup_it++; !is_dup && dup != f; dup= dup_it++)