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/table.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/table.cc')
-rw-r--r-- | sql/table.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sql/table.cc b/sql/table.cc index ee204347b88..e9b89d6b124 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2026,26 +2026,6 @@ bool st_table_list::set_insert_values(MEM_ROOT *mem_root) } -/* - clear insert_values reference - - SYNOPSIS - clear_insert_values() -*/ - -void st_table_list::clear_insert_values() -{ - if (table) - table->insert_values= 0; - else - { - DBUG_ASSERT(view && ancestor && ancestor->next_local); - for (TABLE_LIST *tbl= ancestor; tbl; tbl= tbl->next_local) - tbl->clear_insert_values(); - } -} - - void Field_iterator_view::set(TABLE_LIST *table) { ptr= table->field_translation; |