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.8' into 10.9

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-09 09:57:13 +02:00
parent bfdc4ff22e 75d631f333
commit 22d455612b
574 changed files with 10533 additions and 4208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_prepare.cc
View File

@@ -1288,7 +1288,8 @@ static bool mysql_test_insert_common(Prepared_statement *stmt,
List<List_item> &values_list,
List<Item> &update_fields,
List<Item> &update_values,
enum_duplicates duplic)
enum_duplicates duplic,
bool ignore)
{
THD *thd= stmt->thd;
List_iterator_fast<List_item> its(values_list);
@@ -1324,7 +1325,8 @@ static bool mysql_test_insert_common(Prepared_statement *stmt,
}
if (mysql_prepare_insert(thd, table_list, fields, values, update_fields,
update_values, duplic, &unused_conds, FALSE))
update_values, duplic, ignore,
&unused_conds, FALSE))
goto error;
value_count= values->elements;
@@ -1379,7 +1381,7 @@ static bool mysql_test_insert(Prepared_statement *stmt,
List<List_item> &values_list,
List<Item> &update_fields,
List<Item> &update_values,
enum_duplicates duplic)
enum_duplicates duplic, bool ignore)
{
THD *thd= stmt->thd;
@@ -1395,7 +1397,7 @@ static bool mysql_test_insert(Prepared_statement *stmt,
}
return mysql_test_insert_common(stmt, table_list, fields, values_list,
update_fields, update_values, duplic);
update_fields, update_values, duplic, ignore);
}
@@ -2473,14 +2475,14 @@ static bool check_prepared_statement(Prepared_statement *stmt)
res= mysql_test_insert(stmt, tables, lex->field_list,
lex->many_values,
lex->update_list, lex->value_list,
lex->duplicates);
lex->duplicates, lex->ignore);
break;
case SQLCOM_LOAD:
res= mysql_test_insert_common(stmt, tables, lex->field_list,
lex->many_values,
lex->update_list, lex->value_list,
lex->duplicates);
lex->duplicates, lex->ignore);
break;
case SQLCOM_UPDATE: