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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2024-02-12 11:38:13 +02:00
parent c32e59ac55 36f51d9748
commit 8ec12e0d6d
87 changed files with 1677 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_union.cc
View File

@ -116,12 +116,12 @@ int select_unit::send_data(List<Item> &values)
if (table->no_rows_with_nulls)
table->null_catch_flags= CHECK_ROW_FOR_NULLS_TO_REJECT;
fill_record(thd, table, table->field + addon_cnt, values, true, false);
fill_record(thd, table, table->field + addon_cnt, values, true, false, true);
/* set up initial values for records to be written */
if (addon_cnt && step == UNION_TYPE)
{
DBUG_ASSERT(addon_cnt == 1);
table->field[0]->store((longlong) curr_step, 1);
table->field[0]->store((ulonglong) curr_step, 1);
}
if (unlikely(thd->is_error()))
@ -619,7 +619,7 @@ int select_unit_ext::send_data(List<Item> &values)
if (table->no_rows_with_nulls)
table->null_catch_flags= CHECK_ROW_FOR_NULLS_TO_REJECT;
fill_record(thd, table, table->field + addon_cnt, values, true, false);
fill_record(thd, table, table->field + addon_cnt, values, true, false, true);
/* set up initial values for records to be written */
if ( step == UNION_TYPE )
{
@ -1003,7 +1003,7 @@ int select_union_direct::send_data(List<Item> &items)
}
send_records++;
fill_record(thd, table, table->field, items, true, false);
fill_record(thd, table, table->field, items, true, false, true);
if (unlikely(thd->is_error()))
return true; /* purecov: inspected */