database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2017-08-08 10:18:43 +02:00
parent 2395adfbfd ef2e51c396
commit 8e8d42ddf0
313 changed files with 36802 additions and 2097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_derived.cc
View File

@@ -537,6 +537,8 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
DBUG_ASSERT(derived->table);
}
}
else
derived->table= derived->merge_underlying_list->table;
DBUG_RETURN(FALSE);
}