database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-07-23 18:56:52 +03:00
parent b9865b289a 9d1f3bf2e9
commit f418661efa
27 changed files with 236 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_base.cc
View File

@ -1039,6 +1039,12 @@ retry:
if (res->table && (res->table == table->table))
continue;
/* Skip if table is tmp table */
if (check_flag & CHECK_DUP_SKIP_TEMP_TABLE &&
res->table && res->table->s->tmp_table != NO_TMP_TABLE)
{
continue;
}
if (check_flag & CHECK_DUP_FOR_CREATE)
DBUG_RETURN(res);