diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 16:46:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 16:46:58 +0200 |
| commit | 9835f7b80fc0eaa7fe4969ae87ae1bfbcc7aa157 (patch) | |
| tree | 8c12732d7d80790d1f70ed5e302398600b733186 /sql/sql_delete.cc | |
| parent | 74d648db12e100c628548fb2e5aa67de718bd1fb (diff) | |
| parent | 91e4f00389483d22fa81517bbcdcd21499fd283a (diff) | |
| download | mariadb-git-9835f7b80fc0eaa7fe4969ae87ae1bfbcc7aa157.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c0deb33410d..503e9b9dcbe 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2010, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB + Copyright (c) 2010, 2019, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ #include "records.h" // init_read_record, #include "filesort.h" #include "uniques.h" -#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 @@ -252,9 +252,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()) |