diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
| commit | 22d455612b0abbb4b9f527e61348d4c6336b59d5 (patch) | |
| tree | d39436232e232c5a5beb996e86e2b34b05ab5115 /sql/sql_prepare.cc | |
| parent | bfdc4ff22ecf626eb46479e1a0dc1049d61a8d78 (diff) | |
| parent | 75d631f333544de4487a6dd251d6f361e1d55d6b (diff) | |
| download | mariadb-git-22d455612b0abbb4b9f527e61348d4c6336b59d5.tar.gz | |
Merge branch '10.8' into 10.9
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index cca9036bdac..fbb36f7171f 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -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: |