diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-25 10:25:48 +0200 |
| commit | 27412877dbcf601676f4515a99b2abee1f19623b (patch) | |
| tree | 2cb1a2e1a58ba10f2a96fcdec43f5ed77c326fd0 /sql/sql_select.cc | |
| parent | f2033df6ac0f64664d9aad2d56fdd74f4bf9d666 (diff) | |
| parent | a544225d0a772bd4b67c96f5861ecc0ef7e69bba (diff) | |
| download | mariadb-git-27412877dbcf601676f4515a99b2abee1f19623b.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index da2862654b5..bdf85d0b2fc 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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) |