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 branch '10.6' into 10.9

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-04 08:01:06 +02:00
parent a89527e127 5ea5291d97
commit 34a8e78581
858 changed files with 12277 additions and 6177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/field.cc
View File

@@ -2721,6 +2721,8 @@ bool Field_row::sp_prepare_and_store_item(THD *thd, Item **value)
fixed underlying Item_field pointing to Field_row.
- In case if we're assigning from a ROW() value, src and value[0] will
point to the same Item_row.
- In case if we're assigning from a subselect, src and value[0] also
point to the same Item_singlerow_subselect.
*/
Item *src;
if (!(src= thd->sp_fix_func_item(value)) ||
@@ -2732,6 +2734,7 @@ bool Field_row::sp_prepare_and_store_item(THD *thd, Item **value)
DBUG_RETURN(true);
}
src->bring_value();
DBUG_RETURN(m_table->sp_set_all_fields_from_item(thd, src));
}