mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50
This commit is contained in:
commit
f0c6908a5a
1 changed files with 1 additions and 1 deletions
|
@ -1187,7 +1187,7 @@ static void shrink_varchar(Field* field, const byte* & ptr, char* buf)
|
|||
{
|
||||
if (field->type() == MYSQL_TYPE_VARCHAR) {
|
||||
Field_varstring* f= (Field_varstring*)field;
|
||||
if (f->length_bytes < 256) {
|
||||
if (f->length_bytes == 1) {
|
||||
uint pack_len= field->pack_length();
|
||||
DBUG_ASSERT(1 <= pack_len && pack_len <= 256);
|
||||
if (ptr[1] == 0) {
|
||||
|
|
Loading…
Reference in a new issue