diff options
| author | serg@sergbook.mysql.com <> | 2004-12-31 15:26:24 +0100 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2004-12-31 15:26:24 +0100 |
| commit | a04fc26c5429284ddae3b5aa19220b057d84b302 (patch) | |
| tree | 928b06c231edee4cb95ace87ed30e879e3dcb0fb /sql/sql_insert.cc | |
| parent | 849d1203ffb0a68ccec2e9e6e1baba00b2fbe536 (diff) | |
| parent | 45ce994e5dc31c6eb802c3b8eb8955c320a4c111 (diff) | |
| download | mariadb-git-a04fc26c5429284ddae3b5aa19220b057d84b302.tar.gz | |
manually merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index c681fe25548..7a271daa862 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -702,9 +702,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table, if (!table) table= table_list->table; - if ((thd->lex->sql_command == SQLCOM_INSERT || - thd->lex->sql_command == SQLCOM_REPLACE) && - unique_table(table_list, table_list->next_global)) + if (!select_insert && unique_table(table_list, table_list->next_global)) { my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name); DBUG_RETURN(TRUE); |