diff options
| author | unknown <evgen@moonbone.local> | 2007-03-02 00:10:25 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-02 00:10:25 +0300 |
| commit | b72e3110da881f0bd94efd0e3b2a88b42138a478 (patch) | |
| tree | 21050e48fa1c5ce00614620b5107994fdb4d6cb5 /sql/sql_insert.cc | |
| parent | a0684ef25f7b2a1f6f02abf3fe4d1f3d7ebb7298 (diff) | |
| parent | 1437a9c532df2ff1f7dc5d72fdc50cdb89014c90 (diff) | |
| download | mariadb-git-b72e3110da881f0bd94efd0e3b2a88b42138a478.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql
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_load.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 f1edfb9d787..e625aec4dde 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1043,7 +1043,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, { Item *fake_conds= 0; TABLE_LIST *duplicate; - if ((duplicate= unique_table(thd, table_list, table_list->next_global))) + if ((duplicate= unique_table(thd, table_list, table_list->next_global, 1))) { update_non_unique_table_error(table_list, "INSERT", duplicate); DBUG_RETURN(TRUE); @@ -2423,7 +2423,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u) query */ if (!(lex->current_select->options & OPTION_BUFFER_RESULT) && - unique_table(thd, table_list, table_list->next_global)) + unique_table(thd, table_list, table_list->next_global, 0)) { /* Using same table for INSERT and SELECT */ lex->current_select->options|= OPTION_BUFFER_RESULT; |