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.4 to 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-10-22 17:08:49 +03:00
parent cca75c95bc 9868253b32
commit 1657b7a583
185 changed files with 3709 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_prepare.cc
View File

@ -4368,7 +4368,7 @@ Prepared_statement::execute_bulk_loop(String *expanded_query,
return TRUE;
}
if (!(sql_command_flags[lex->sql_command] & CF_SP_BULK_SAFE))
if (!(sql_command_flags[lex->sql_command] & CF_PS_ARRAY_BINDING_SAFE))
{
DBUG_PRINT("error", ("Command is not supported in bulk execution."));
my_error(ER_UNSUPPORTED_PS, MYF(0));
@ -4400,7 +4400,7 @@ Prepared_statement::execute_bulk_loop(String *expanded_query,
Here we set parameters for not optimized commands,
optimized commands do it inside thier internal loop.
*/
if (!(sql_command_flags[lex->sql_command] & CF_SP_BULK_OPTIMIZED))
if (!(sql_command_flags[lex->sql_command] & CF_PS_ARRAY_BINDING_OPTIMIZED))
{
if (set_bulk_parameters(TRUE))
{