diff options
| author | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2005-02-17 17:38:13 +0000 |
|---|---|---|
| committer | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2005-02-17 17:38:13 +0000 |
| commit | 28f79321f669c2a75f60a8adf1d9ba45308099b9 (patch) | |
| tree | 579a318fe196e3b6694931b75c907f2a26fabe53 /sql/sql_insert.cc | |
| parent | 1fbeaf710ab4e1b8f532e82c6d304dd1be59e614 (diff) | |
| parent | 6078fcc1f05bb159928a1e09bacbbc57b3ae07cf (diff) | |
| download | mariadb-git-28f79321f669c2a75f60a8adf1d9ba45308099b9.tar.gz | |
Bug#8147
Merge from 4.1
mysql-test/r/insert_update.result:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index fa6f1e05dc6..b7e31dd126d 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -671,6 +671,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table, bool insert_into_view= (table_list->view != 0); /* TODO: use this condition for 'WITH CHECK OPTION' */ bool res; + TABLE_LIST *next_local; DBUG_ENTER("mysql_prepare_insert"); DBUG_PRINT("enter", ("table_list 0x%lx, table 0x%lx, view %d", (ulong)table_list, (ulong)table, @@ -687,6 +688,8 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table, select_insert)) DBUG_RETURN(TRUE); + next_local= table_list->next_local; + table_list->next_local= 0; if ((values && check_insert_fields(thd, table_list, fields, *values, 1, !insert_into_view)) || (values && setup_fields(thd, 0, table_list, *values, 0, 0, 0)) || @@ -697,6 +700,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table, res) || setup_fields(thd, 0, table_list, update_values, 1, 0, 0)))) DBUG_RETURN(TRUE); + table_list->next_local= next_local; if (!table) table= table_list->table; |