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_insert.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_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 7a271daa862..41cc6ebf101 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -501,7 +501,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, ::send_ok(thd, (ulong) thd->row_count_func, id, buff); } free_underlaid_joins(thd, &thd->lex->select_lex); - table_list->clear_insert_values(); thd->abort_on_warning= 0; DBUG_RETURN(FALSE); @@ -511,7 +510,6 @@ abort: end_delayed_insert(thd); #endif free_underlaid_joins(thd, &thd->lex->select_lex); - table_list->clear_insert_values(); thd->abort_on_warning= 0; DBUG_RETURN(TRUE); } |