mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Fix for few PROCEDURE bugs ...
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -324,7 +324,7 @@ void field_str::add()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
bzero((char*) &s, sizeof(s)); // Let tree handle free of this
|
// bzero((char*) &s, sizeof(s)); // Let tree handle free of this
|
||||||
if ((treemem += length) > pc->max_treemem)
|
if ((treemem += length) > pc->max_treemem)
|
||||||
{
|
{
|
||||||
room_in_tree = 0; // Remove tree, too big tree
|
room_in_tree = 0; // Remove tree, too big tree
|
||||||
|
@@ -733,6 +733,8 @@ JOIN::exec()
|
|||||||
HA_POS_ERROR : unit->select_limit_cnt,
|
HA_POS_ERROR : unit->select_limit_cnt,
|
||||||
0))))
|
0))))
|
||||||
order=0;
|
order=0;
|
||||||
|
if (procedure)
|
||||||
|
(void)result->prepare(fields_list, unit);
|
||||||
select_describe(this, need_tmp,
|
select_describe(this, need_tmp,
|
||||||
order != 0 && !skip_sort_order,
|
order != 0 && !skip_sort_order,
|
||||||
select_distinct);
|
select_distinct);
|
||||||
|
Reference in New Issue
Block a user