Commit bfcb40dd authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

fixed possible bug (call with incorrect parameters)

parent bd6f8e0b
...@@ -7268,7 +7268,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order, ...@@ -7268,7 +7268,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
item_list.push_back(new Item_string(message,strlen(message), item_list.push_back(new Item_string(message,strlen(message),
default_charset_info)); default_charset_info));
if (result->send_data(item_list)) if (result->send_data(item_list))
result->send_error(0,NullS); join->error= 1;
} }
else else
{ {
...@@ -7431,7 +7431,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order, ...@@ -7431,7 +7431,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
// For next iteration // For next iteration
used_tables|=table->map; used_tables|=table->map;
if (result->send_data(item_list)) if (result->send_data(item_list))
result->send_error(0,NullS); join->error= 1;
} }
} }
for (SELECT_LEX_UNIT *unit= join->select_lex->first_inner_unit(); for (SELECT_LEX_UNIT *unit= join->select_lex->first_inner_unit();
......
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