diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
| commit | 74e2520cd94200e326715a7733d2583a185bc6a7 (patch) | |
| tree | a0d8f4957cf9d256a3cc3445c7db25384f97e249 /sql/key.cc | |
| parent | 8b1571d80341770818404c9cc9ed4b362ffe5710 (diff) | |
| parent | 33827e7dbfc177ef52718f63eaf87e005ab3e8b5 (diff) | |
| download | mariadb-git-74e2520cd94200e326715a7733d2583a185bc6a7.tar.gz | |
merge mysql-5.5->mysql-5.5-bugteam
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/key.cc b/sql/key.cc index e28e0803986..288afd034a9 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -364,9 +364,7 @@ void key_unpack(String *to,TABLE *table,uint idx) while (tmp_end > tmp.ptr() && !*--tmp_end) ; tmp.length(tmp_end - tmp.ptr() + 1); } - if (cs->mbmaxlen > 1 && - table->field[key_part->fieldnr - 1]->field_length != - key_part->length) + if (cs->mbmaxlen > 1 && (key_part->key_part_flag & HA_PART_KEY_SEG)) { /* Prefix key, multi-byte charset. |