diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-03-01 15:52:06 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-03-01 15:52:06 +0100 |
| commit | f2e1451740d417f1c9ea8626d937fbcacc91bb55 (patch) | |
| tree | cd915badee79727c047208a7804181543cdb9c27 /sql/sql_insert.cc | |
| parent | e39d6e0c53bccaf0c6b2a0341f8deb420f5e79be (diff) | |
| parent | 2d34713294d5339d1459911a46fa20395443b3c7 (diff) | |
| download | mariadb-git-f2e1451740d417f1c9ea8626d937fbcacc91bb55.tar.gz | |
Merge branch '10.0' into 10.1
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 d695c586529..6455818993d 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1461,7 +1461,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 @@ -1557,7 +1557,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 |