database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Sergei Golubchik
2017-08-25 10:25:48 +02:00
parent f2033df6ac a544225d0a
commit 27412877db
585 changed files with 79328 additions and 12271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@@ -3879,7 +3879,7 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list,
#endif
DBUG_EXECUTE_IF("bug11747970_raise_error",
{ join->thd->killed= KILL_QUERY_HARD; });
{ join->thd->set_killed(KILL_QUERY_HARD); });
if (error)
{
table->file->print_error(error, MYF(0));
@@ -16866,7 +16866,12 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
Field **tmp_from_field=from_field;
while ((item=li++))
{
Item::Type type=item->type();
Item::Type type= item->type();
if (type == Item::COPY_STR_ITEM)
{
item= ((Item_copy *)item)->get_item();
type= item->type();
}
if (not_all_columns)
{
if (item->with_sum_func && type != Item::SUM_FUNC_ITEM)