mirror of
https://github.com/MariaDB/server.git
synced 2026-04-26 10:15:29 +02:00
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
This commit is contained in:
commit
f03a3ee54f
99 changed files with 4331 additions and 1089 deletions
|
|
@ -722,8 +722,8 @@ bool Select_materialize::send_fields(List<Item> &list, uint flags)
|
|||
DBUG_ASSERT(table == 0);
|
||||
if (create_result_table(unit->thd, unit->get_unit_column_types(),
|
||||
FALSE, thd->options | TMP_TABLE_ALL_COLUMNS, "",
|
||||
FALSE))
|
||||
return TRUE;
|
||||
FALSE, TRUE))
|
||||
return TRUE;
|
||||
|
||||
materialized_cursor= new (&table->mem_root)
|
||||
Materialized_cursor(result, table);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue