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_delete.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_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 bbea9815547..46415566bc2 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -40,7 +40,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 @@ -234,9 +234,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()) |