diff options
author | unknown <monty@mysql.com> | 2005-01-03 13:56:23 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-01-03 13:56:23 +0200 |
commit | e055be6658fff00587999a1aab7dae522ba99cfc (patch) | |
tree | f27a4a08cde5c6ad67311ca316ad5011ad1759dd /sql/sql_parse.cc | |
parent | 3652c4edd94af2b0ae0a9f7bb06e58dea7cfdc15 (diff) | |
download | mariadb-git-e055be6658fff00587999a1aab7dae522ba99cfc.tar.gz |
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()
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1e03af7626c..096d6fa8e45 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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; } |