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

Merge branch '11.0' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2018-09-06 22:45:19 +02:00
parent b0026e33af 3a4242fd57
commit 31081593aa
250 changed files with 4958 additions and 194807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@ -5575,7 +5575,8 @@ has_write_table_with_auto_increment_and_select(TABLE_LIST *tables)
for(TABLE_LIST *table= tables; table; table= table->next_global)
{
if (!table->placeholder() &&
(table->lock_type <= TL_READ_NO_INSERT))
table->lock_type <= TL_READ_NO_INSERT &&
table->prelocking_placeholder != TABLE_LIST::FK)
{
has_select= true;
break;