diff options
| author | unknown <pem@mysql.com> | 2003-04-30 14:56:41 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-04-30 14:56:41 +0200 |
| commit | 0e891786615356dbc9bca3c5132e259e92b89ad9 (patch) | |
| tree | 51da85a3db6e8de95600d7e09e3e1fe9aaf7ecac | |
| parent | aa1720f3cbfaa985124d982fc0a421084f52fbf0 (diff) | |
| parent | 4a506d6e23845bf5d8208da741bd85cdcb0d4270 (diff) | |
| download | mariadb-git-0e891786615356dbc9bca3c5132e259e92b89ad9.tar.gz | |
Merge mysql.com:/home/pem/work/mysql-4.1
into mysql.com:/home/pem/work/mysql-5.0
| -rw-r--r-- | sql/item_strfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index bba3799d398..e6bd969ad2f 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2955,8 +2955,9 @@ String *Item_func_compress::val_str(String *str) null_value= 1; 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 ' ': */ char *last_char= ((char*)body)+new_size-1; |