1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merged the code of MWL#106 into 5.3

Resolved all conflicts, bad merges and fixed a few minor bugs in the code.
Commented out the queries from multi_update, view, subselect_sj, func_str,
derived_view, view_grant that failed either with crashes in ps-protocol or
with wrong results.
The failures are clear indications of some bugs in the code and these bugs
are to be fixed.
This commit is contained in:
Igor Babaev
2011-05-16 22:39:43 -07:00
92 changed files with 4191 additions and 1093 deletions

View File

@@ -720,8 +720,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);