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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
sql/sql_select.cc
View File

@@ -8010,6 +8010,30 @@ double hash_join_fanout(JOIN *join, JOIN_TAB *s, table_map remaining_tables,
}
#ifndef DBUG_OFF
static char dbug_join_prefix_buf[256];
const char* dbug_print_join_prefix(const POSITION *join_positions,
uint idx,
JOIN_TAB *s)
{
char *buf= dbug_join_prefix_buf;
String str(buf, sizeof(dbug_join_prefix_buf), &my_charset_bin);
str.length(0);
for (uint i=0; i!=idx; i++)
{
str.append(join_positions[i].table->table->alias);
str.append(',');
}
str.append(s->table->alias);
if (str.c_ptr_safe() == buf)
return buf;
else
return "Couldn't fit into buffer";
}
#endif
/**
Find the best access path for an extension of a partial execution
plan and add this path to the plan.
@@ -8033,6 +8057,14 @@ double hash_join_fanout(JOIN *join, JOIN_TAB *s, table_map remaining_tables,
@param pos OUT Table access plan
@param loose_scan_pos OUT Table plan that uses loosescan, or set cost to
DBL_MAX if not possible.
@detail
Use this to print the current join prefix:
dbug_print_join_prefix(join_positions, idx, s)
Use this as breakpoint condition to stop at join prefix "t1,t2,t3":
$_streq(dbug_print_join_prefix(join_positions, idx, s), "t1,t2,t3")
@return
None
@@ -14941,13 +14973,6 @@ void JOIN_TAB::cleanup()
delete filesort->select;
delete filesort;
filesort= NULL;
/* Skip non-existing derived tables/views result tables */
if (table &&
(table->s->tmp_table != INTERNAL_TMP_TABLE || table->is_created()))
{
table->file->ha_end_keyread();
table->file->ha_index_or_rnd_end();
}
if (table)
{
table->file->ha_end_keyread();
@@ -14956,8 +14981,7 @@ void JOIN_TAB::cleanup()
else
table->file->ha_index_or_rnd_end();
preread_init_done= FALSE;
if (table->pos_in_table_list &&
table->pos_in_table_list->jtbm_subselect)
if (table->pos_in_table_list && table->pos_in_table_list->jtbm_subselect)
{
if (table->pos_in_table_list->jtbm_subselect->is_jtbm_const_tab)
{
@@ -29970,6 +29994,18 @@ void st_select_lex::print_on_duplicate_key_clause(THD *thd, String *str,
}
}
void st_select_lex::print_lock_type(String *str)
{
if (select_lock == select_lock_type::IN_SHARE_MODE)
str->append(STRING_WITH_LEN(" lock in share mode"));
else if (select_lock == select_lock_type::FOR_UPDATE)
str->append(STRING_WITH_LEN(" for update"));
if (unlikely(skip_locked))
str->append(STRING_WITH_LEN(" skip locked"));
}
void st_select_lex::print(THD *thd, String *str, enum_query_type query_type)
{
DBUG_ASSERT(thd);
@@ -30241,12 +30277,9 @@ void st_select_lex::print(THD *thd, String *str, enum_query_type query_type)
print_limit(thd, str, query_type);
// lock type
if (select_lock == select_lock_type::IN_SHARE_MODE)
str->append(STRING_WITH_LEN(" lock in share mode"));
else if (select_lock == select_lock_type::FOR_UPDATE)
str->append(STRING_WITH_LEN(" for update"));
if (unlikely(skip_locked))
str->append(STRING_WITH_LEN(" skip locked"));
if (braces) /* no braces processed in
SELECT_LEX_UNIT::print_lock_from_the_last_select */
print_lock_type(str);
if ((sel_type == INSERT_CMD || sel_type == REPLACE_CMD) &&
thd->lex->update_list.elements)