database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-07-07 12:43:10 +04:00
parent 3f32743294 3b862aaa10
commit 8b2c7c9444
382 changed files with 19532 additions and 17438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_insert.cc
View File

@ -4421,6 +4421,15 @@ void select_create::store_values(List<Item> &values)
bool select_create::send_eof()
{
DBUG_ENTER("select_create::send_eof");
/*
The routine that writes the statement in the binary log
is in select_insert::prepare_eof(). For that reason, we
mark the flag at this point.
*/
if (table->s->tmp_table)
thd->transaction.stmt.mark_created_temp_table();
if (prepare_eof())
{
abort_result_set();