diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-14 11:52:00 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-14 11:52:00 +0100 |
| commit | 05d3c3d3f748f74bbd12924d090f882c5c928249 (patch) | |
| tree | d15b528bced3ab5b1ce86ea0569eeba2efe67115 /sql/sql_cursor.cc | |
| parent | e43156e1a679c95413aab2c4bf9523da7947fc18 (diff) | |
| download | mariadb-git-05d3c3d3f748f74bbd12924d090f882c5c928249.tar.gz | |
MDEV-10141: Add support for INTERSECT (and common parts for EXCEPT)
MDEV-10140: Add support for EXCEPT
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 118c6f23cb0..60d80387a10 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -68,13 +68,13 @@ public: create a Materialized_cursor. */ -class Select_materialize: public select_union +class Select_materialize: public select_unit { select_result *result; /**< the result object of the caller (PS or SP) */ public: Materialized_cursor *materialized_cursor; Select_materialize(THD *thd_arg, select_result *result_arg): - select_union(thd_arg), result(result_arg), materialized_cursor(0) {} + select_unit(thd_arg), result(result_arg), materialized_cursor(0) {} virtual bool send_result_set_metadata(List<Item> &list, uint flags); bool send_eof() { @@ -436,7 +436,7 @@ bool Select_materialize::send_result_set_metadata(List<Item> &list, uint flags) if (create_result_table(unit->thd, unit->get_column_types(true), FALSE, thd->variables.option_bits | TMP_TABLE_ALL_COLUMNS, - "", FALSE, TRUE, TRUE)) + "", FALSE, TRUE, TRUE, 0)) return TRUE; materialized_cursor= new (&table->mem_root) |