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_delete.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_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 7733d2501b8..9f3caf9df4f 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -39,7 +39,7 @@ #include "sql_statistics.h" #include "transaction.h" #include "records.h" // init_read_record, -#include "sql_derived.h" // mysql_handle_list_of_derived +#include "sql_derived.h" // mysql_handle_derived // end_read_record #include "sql_partition.h" // make_used_partitions_str @@ -248,9 +248,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, if (open_and_lock_tables(thd, table_list, TRUE, 0)) DBUG_RETURN(TRUE); - if (mysql_handle_list_of_derived(thd->lex, table_list, DT_MERGE_FOR_INSERT)) + if (thd->lex->handle_list_of_derived(table_list, 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); if (!table_list->single_table_updatable()) |