diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-23 18:56:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-23 18:56:52 +0300 |
| commit | f418661efa34b5589c9e33cd8821c186f587fc06 (patch) | |
| tree | faf72636b6b19c403c8a316fb601d7c214f0510b /sql/sql_parse.cc | |
| parent | b9865b289a756f68e522e094f37f24a4d7e45aa9 (diff) | |
| parent | 9d1f3bf2e9425db8e352ee80e7b456dd6ef73fcb (diff) | |
| download | mariadb-git-f418661efa34b5589c9e33cd8821c186f587fc06.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a1cacbd35a2..d8f4f492903 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4196,7 +4196,8 @@ mysql_execute_command(THD *thd) TABLE_LIST *duplicate; if (unlikely((duplicate= unique_table(thd, lex->query_tables, lex->query_tables->next_global, - CHECK_DUP_FOR_CREATE)))) + CHECK_DUP_FOR_CREATE | + CHECK_DUP_SKIP_TEMP_TABLE)))) { update_non_unique_table_error(lex->query_tables, "CREATE", duplicate); |