database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2018-01-29 12:44:20 +04:00
parent b4a2baffa8 b12430adc7
commit c7a2f23a7b
56 changed files with 639 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sql/sql_select.cc
View File

@ -3395,6 +3395,7 @@ JOIN::create_postjoin_aggr_table(JOIN_TAB *tab, List<Item> *table_fields,
THD_STAGE_INFO(thd, stage_sorting_for_group);
if (ordered_index_usage != ordered_index_group_by &&
!only_const_tables() &&
(join_tab + const_tables)->type != JT_CONST && // Don't sort 1 row
!implicit_grouping &&
add_sorting_to_table(join_tab + const_tables, group_list))
@ -3428,6 +3429,7 @@ JOIN::create_postjoin_aggr_table(JOIN_TAB *tab, List<Item> *table_fields,
THD_STAGE_INFO(thd, stage_sorting_for_order);
if (ordered_index_usage != ordered_index_order_by &&
!only_const_tables() &&
add_sorting_to_table(join_tab + const_tables, order))
goto err;
order= NULL;
@ -17995,6 +17997,70 @@ bool Virtual_tmp_table::open()
}
bool Virtual_tmp_table::sp_find_field_by_name(uint *idx,
const LEX_CSTRING &name) const
{
Field *f;
for (uint i= 0; (f= field[i]); i++)
{
// Use the same comparison style with sp_context::find_variable()
if (!my_strnncoll(system_charset_info,
(const uchar *) f->field_name.str,
f->field_name.length,
(const uchar *) name.str, name.length))
{
*idx= i;
return false;
}
}
return true;
}
bool
Virtual_tmp_table::sp_find_field_by_name_or_error(uint *idx,
const LEX_CSTRING &var_name,
const LEX_CSTRING &field_name)
const
{
if (sp_find_field_by_name(idx, field_name))
{
my_error(ER_ROW_VARIABLE_DOES_NOT_HAVE_FIELD, MYF(0),
var_name.str, field_name.str);
return true;
}
return false;
}
bool Virtual_tmp_table::sp_set_all_fields_from_item_list(THD *thd,
List<Item> &items)
{
DBUG_ASSERT(s->fields == items.elements);
List_iterator<Item> it(items);
Item *item;
for (uint i= 0 ; (item= it++) ; i++)
{
if (field[i]->sp_prepare_and_store_item(thd, &item))
return true;
}
return false;
}
bool Virtual_tmp_table::sp_set_all_fields_from_item(THD *thd, Item *value)
{
DBUG_ASSERT(value->fixed);
DBUG_ASSERT(value->cols() == s->fields);
for (uint i= 0; i < value->cols(); i++)
{
if (field[i]->sp_prepare_and_store_item(thd, value->addr(i)))
return true;
}
return false;
}
bool open_tmp_table(TABLE *table)
{
int error;