diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /sql/opt_subselect.cc | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index c1052869c8f..79b28a5994e 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -4175,7 +4175,6 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd) field->null_ptr, field->null_bit))) goto err; - key_part_info->key_part_flag|= HA_END_SPACE_ARE_EQUAL; //todo need this? } keyinfo->key_length+= key_part_info->length; } @@ -4739,8 +4738,6 @@ int clear_sj_tmp_tables(JOIN *join) { if ((res= table->file->ha_delete_all_rows())) return res; /* purecov: inspected */ - free_io_cache(table); - filesort_free_buffers(table,0); } SJ_MATERIALIZATION_INFO *sjm; |