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 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-07-02 06:17:51 +03:00
parent 6d3747a294 dba7e1e8e1
commit 1df1a63924
210 changed files with 2371 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_prepare.cc
View File

@ -849,6 +849,8 @@ static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array,
if (param->convert_str_value(thd))
DBUG_RETURN(1); /* out of memory */
param->sync_clones();
}
if (acc.finalize())
DBUG_RETURN(1);
@ -3090,7 +3092,10 @@ static void reset_stmt_params(Prepared_statement *stmt)
Item_param **item= stmt->param_array;
Item_param **end= item + stmt->param_count;
for (;item < end ; ++item)
{
(**item).reset();
(**item).sync_clones();
}
}