mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Move reset of insert_values to ensure it's done also during error conditions
This fixed a failure of insert_update.test on some platforms mysys/thr_alarm.c: Fixed problem noticed by valgrind sql/opt_range.cc: Simple optimization for common case sql/sql_base.cc: Safety assert sql/sql_insert.cc: Added comment
This commit is contained in:
@@ -2891,12 +2891,12 @@ unsent_create_error:
|
||||
/* revert changes for SP */
|
||||
lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
|
||||
delete result;
|
||||
insert_table->insert_values= 0;
|
||||
if (thd->net.report_error)
|
||||
res= -1;
|
||||
}
|
||||
else
|
||||
res= -1;
|
||||
insert_table->insert_values= 0; // Set by mysql_prepare_insert()
|
||||
first_local_table->next= tables;
|
||||
lex->select_lex.table_list.first= (byte*) first_local_table;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user