Merge mysql.com:/home/pem/work/mysql-4.1
into mysql.com:/home/pem/work/mysql-5.0
This commit is contained in:
commit
0e89178661
@ -2955,8 +2955,9 @@ String *Item_func_compress::val_str(String *str)
|
|||||||
null_value= 1;
|
null_value= 1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int4store(buffer.c_ptr(),res->length() & 0x3FFFFFFF);
|
char *tmp= buffer.c_ptr(); // int4store is a macro; avoid side effects
|
||||||
|
int4store(tmp, res->length() & 0x3FFFFFFF);
|
||||||
|
|
||||||
/* This is for the stupid char fields which trim ' ': */
|
/* This is for the stupid char fields which trim ' ': */
|
||||||
char *last_char= ((char*)body)+new_size-1;
|
char *last_char= ((char*)body)+new_size-1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user