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/key.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/key.cc')
| -rw-r--r-- | sql/key.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/key.cc b/sql/key.cc index 1b00e951de0..31b65adabe9 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -328,7 +328,7 @@ bool key_cmp_if_same(TABLE *table,const uchar *key,uint idx,uint key_length) } if (cs->coll->strnncollsp(cs, (const uchar*) key, length, - (const uchar*) pos, char_length, 0)) + (const uchar*) pos, char_length)) return 1; continue; } @@ -891,8 +891,7 @@ bool key_buf_cmp(KEY *key_info, uint used_key_parts, if (length1 != length2 || cs->coll->strnncollsp(cs, pos1 + pack_length, byte_len1, - pos2 + pack_length, byte_len2, - 1)) + pos2 + pack_length, byte_len2)) return TRUE; key1+= pack_length; key2+= pack_length; } |