Commit 1fa45d61 authored by konstantin@mysql.com's avatar konstantin@mysql.com

Merge mysql.com:/opt/local/work/mysql-5.0-8568

into  mysql.com:/opt/local/work/mysql-5.1-new
parents b3845d1f 723baa4d
...@@ -661,11 +661,10 @@ Materialized_cursor::~Materialized_cursor() ...@@ -661,11 +661,10 @@ Materialized_cursor::~Materialized_cursor()
bool Select_materialize::send_fields(List<Item> &list, uint flags) bool Select_materialize::send_fields(List<Item> &list, uint flags)
{ {
bool rc;
DBUG_ASSERT(table == 0); DBUG_ASSERT(table == 0);
if (create_result_table(unit->thd, unit->get_unit_column_types(), if (create_result_table(unit->thd, unit->get_unit_column_types(),
FALSE, thd->options | TMP_TABLE_ALL_COLUMNS, "")) FALSE, thd->options | TMP_TABLE_ALL_COLUMNS, ""))
return TRUE; return TRUE;
return rc; return FALSE;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment