Commit 4e40725c authored by pem@mysql.com's avatar pem@mysql.com

Merge mysql.com:/home/pem/work/mysql-4.1

into mysql.com:/home/pem/work/mysql-5.0
parents e73dafdc 8cf4e729
...@@ -2956,7 +2956,8 @@ String *Item_func_compress::val_str(String *str) ...@@ -2956,7 +2956,8 @@ String *Item_func_compress::val_str(String *str)
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;
......
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