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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-20 09:57:37 +02:00
parent 8d6c9ef001 cbb24d9aa5
commit 98dbe3bfaf
142 changed files with 3642 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_union.cc
View File

@@ -547,7 +547,7 @@ int select_unit::delete_record()
tables of JOIN - exec_tmp_table_[1 | 2].
*/
void select_unit::cleanup()
void select_unit::reset_for_next_ps_execution()
{
table->file->extra(HA_EXTRA_RESET_STATE);
table->file->ha_delete_all_rows();
@@ -902,11 +902,11 @@ bool select_unit_ext::send_eof()
return (MY_TEST(error));
}
void select_union_recursive::cleanup()
void select_union_recursive::reset_for_next_ps_execution()
{
if (table)
{
select_unit::cleanup();
select_unit::reset_for_next_ps_execution();
free_tmp_table(thd, table);
}
@@ -2192,7 +2192,7 @@ bool st_select_lex_unit::exec()
if (uncacheable || !item || !item->assigned() || describe)
{
if (!fake_select_lex && !(with_element && with_element->is_recursive))
union_result->cleanup();
union_result->reset_for_next_ps_execution();
for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
{
ha_rows records_at_start= 0;
@@ -2634,7 +2634,7 @@ bool st_select_lex_unit::cleanup()
{
if (union_result)
{
((select_union_recursive *) union_result)->cleanup();
((select_union_recursive *) union_result)->reset_for_next_ps_execution();
delete union_result;
union_result= 0;
}