database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into bb-10.2-mdev9543

Browse Source 
- Make Window Functions errors use the MariaDB's extra error range.
- Fix a trivial bug in check_error_mesg
This commit is contained in:
Sergei Petrunia
2016-04-07 00:54:39 +03:00
parent 306de8a927 89b744eb6c
commit 59e5f5b47e
1678 changed files with 42477 additions and 13481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -16729,8 +16729,6 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
cur_group->buff++; // Pointer to field data
group_buff++; // Skipp null flag
}
/* In GROUP BY 'a' and 'a ' are equal for VARCHAR fields */
key_part_info->key_part_flag|= HA_END_SPACE_ARE_EQUAL;
group_buff+= cur_group->field->pack_length();
}
keyinfo->key_length+= key_part_info->length;