Commit 32e6e6aa authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825

parents e2de3a8f 4ca413e9
...@@ -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