diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-04-07 00:54:39 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-04-07 00:54:39 +0300 |
| commit | 59e5f5b47e1f12a1426319a905dbc8cc55219c0d (patch) | |
| tree | b2095faf431949d31e2ea69200bea27a8cf2f629 /sql/opt_subselect.cc | |
| parent | 306de8a927916db98c67fa338b5a275735f78240 (diff) | |
| parent | 89b744eb6c2484412f476a53087cea7bf28dc917 (diff) | |
| download | mariadb-git-59e5f5b47e1f12a1426319a905dbc8cc55219c0d.tar.gz | |
Merge branch '10.2' into bb-10.2-mdev9543
- Make Window Functions errors use the MariaDB's extra error range.
- Fix a trivial bug in check_error_mesg
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 33c406bd756..55c6c075f48 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -4167,7 +4167,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; } |