diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-28 21:50:00 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-28 21:50:00 +0100 |
| commit | 7b5c63856b324281a3b0533b7b90fb6c130fcc66 (patch) | |
| tree | cf7150ac4ac72de333cb624e5a70f058546e9cc5 /sql/sql_insert.cc | |
| parent | d9d83f1d92b696ef56f4944df036b8a78364ebb4 (diff) | |
| parent | cb11b3fbe9d4dde776cb8f2c0d6f83a569655efc (diff) | |
| download | mariadb-git-7b5c63856b324281a3b0533b7b90fb6c130fcc66.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 5ecdd72541f..c10d3517b5e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1383,7 +1383,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, DBUG_RETURN(TRUE); if (table_list->handle_derived(thd->lex, DT_MERGE_FOR_INSERT)) DBUG_RETURN(TRUE); - if (mysql_handle_list_of_derived(thd->lex, table_list, DT_PREPARE)) + if (thd->lex->handle_list_of_derived(table_list, DT_PREPARE)) DBUG_RETURN(TRUE); /* For subqueries in VALUES() we should not see the table in which we are @@ -1490,7 +1490,6 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, DBUG_RETURN(TRUE); } select_lex->fix_prepare_information(thd, &fake_conds, &fake_conds); - select_lex->first_execution= 0; } /* Only call prepare_for_posistion() if we are not performing a DELAYED |