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 remote-tracking branch 'github/bb-11.4-release' into bb-11.8-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-27 11:33:27 +02:00
committed by Oleksandr Byelkin
parent a0b77eb806 a8d4642375
commit 237e24497b
430 changed files with 14769 additions and 6751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_prepare.cc
View File

@@ -1316,6 +1316,7 @@ static bool mysql_test_insert_common(Prepared_statement *stmt,
THD *thd= stmt->thd;
List_iterator_fast<List_item> its(values_list);
List_item *values;
bool cache_results= FALSE;
DBUG_ENTER("mysql_test_insert_common");
if (insert_precheck(thd, table_list))
@@ -1348,7 +1349,8 @@ static bool mysql_test_insert_common(Prepared_statement *stmt,
if (mysql_prepare_insert(thd, table_list, fields, values, update_fields,
update_values, duplic, ignore,
&unused_conds, FALSE))
&unused_conds, FALSE,
&cache_results))
goto error;
value_count= values->elements;
@@ -5493,8 +5495,8 @@ public:
my_bool do_log_bin;
Protocol_local(THD *thd_arg, THD *new_thd_arg, ulong prealloc) :
Protocol_text(thd_arg, prealloc),
Protocol_local(THD *thd_arg, THD *new_thd_arg) :
Protocol_text(thd_arg),
cur_data(0), first_data(0), data_tail(&first_data), alloc(0),
new_thd(new_thd_arg), do_log_bin(FALSE)
{}
@@ -6310,7 +6312,7 @@ extern "C" MYSQL *mysql_real_connect_local(MYSQL *mysql)
else
new_thd= NULL;
p= new Protocol_local(thd_orig, new_thd, 0);
p= new Protocol_local(thd_orig, new_thd);
if (new_thd)
new_thd->protocol= p;
else