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 branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-07-05 19:08:55 +02:00
parent fc5932a1b7 e555540ab6
commit f6633bf058
99 changed files with 2787 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_insert.cc
View File

@ -4419,6 +4419,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();