mirror of
https://github.com/MariaDB/server.git
synced 2026-05-08 08:04:29 +02:00
Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases
(Old code failed for INSERT ... ON DUPLICATE with prepared statements) Instead, always reset table->insert_values on open. mysql-test/t/trigger.test: Fix test for --ps-protocol sql/sql_base.cc: Clear insert_values on open_table sql/sql_insert.cc: Remove clear_insert_values() sql/sql_parse.cc: Remove clear_insert_values() sql/sql_prepare.cc: Remove clear_insert_values() sql/table.cc: Remove clear_insert_values() sql/table.h: Remove clear_insert_values()
This commit is contained in:
parent
3652c4edd9
commit
e055be6658
7 changed files with 14 additions and 29 deletions
|
|
@ -3009,9 +3009,6 @@ create_error:
|
|||
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
|
||||
delete result;
|
||||
}
|
||||
/* in case of error first_table->table can be 0 */
|
||||
if (first_table->table)
|
||||
first_table->table->insert_values= 0;
|
||||
/* revert changes for SP */
|
||||
lex->select_lex.table_list.first= (byte*) first_table;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue