Commit f0c6908a authored by pekka@mysql.com's avatar pekka@mysql.com

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/export/space/pekka/ndb/version/my50
parents acfd4070 ae2346dd
...@@ -1187,7 +1187,7 @@ static void shrink_varchar(Field* field, const byte* & ptr, char* buf) ...@@ -1187,7 +1187,7 @@ static void shrink_varchar(Field* field, const byte* & ptr, char* buf)
{ {
if (field->type() == MYSQL_TYPE_VARCHAR) { if (field->type() == MYSQL_TYPE_VARCHAR) {
Field_varstring* f= (Field_varstring*)field; Field_varstring* f= (Field_varstring*)field;
if (f->length_bytes < 256) { if (f->length_bytes == 1) {
uint pack_len= field->pack_length(); uint pack_len= field->pack_length();
DBUG_ASSERT(1 <= pack_len && pack_len <= 256); DBUG_ASSERT(1 <= pack_len && pack_len <= 256);
if (ptr[1] == 0) { if (ptr[1] == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment