diff options
| author | unknown <ingo@mysql.com> | 2005-12-27 10:31:00 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-12-27 10:31:00 +0100 |
| commit | d03d5a305f21e84f6df95318aa7dbf99a287ad56 (patch) | |
| tree | b4448bbf385fd96fc00b6783cc8e9f1a08ac15aa /sql/sql_insert.cc | |
| parent | 6759bbce9ac1a01f5f218d777a5a6e4fb0ceab0d (diff) | |
| parent | e049f2c8fd6fe2f7dbf3877622737d8b6868721b (diff) | |
| download | mariadb-git-d03d5a305f21e84f6df95318aa7dbf99a287ad56.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug5390
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e5ea296afab..7c41551d641 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -873,7 +873,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, { Item *fake_conds= 0; TABLE_LIST *duplicate; - if ((duplicate= unique_table(table_list, table_list->next_global))) + if ((duplicate= unique_table(thd, table_list, table_list->next_global))) { update_non_unique_table_error(table_list, "INSERT", duplicate); DBUG_RETURN(TRUE); @@ -2174,7 +2174,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u) query */ if (!(lex->current_select->options & OPTION_BUFFER_RESULT) && - unique_table(table_list, table_list->next_global)) + unique_table(thd, table_list, table_list->next_global)) { /* Using same table for INSERT and SELECT */ lex->current_select->options|= OPTION_BUFFER_RESULT; |