diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-08-04 12:18:32 +0400 |
| commit | aeeafbb39656fc4678c72b00f958215754b32dc7 (patch) | |
| tree | 512613b578f3b028a4c6b6272b2dc4820676ad8b /storage/myisam/mi_packrec.c | |
| parent | efc8a279356bd2afd8d6af341f7cf80860475efd (diff) | |
| parent | 81906cdf3805fe5fcea47fef11945f9adbcef4d8 (diff) | |
| download | mariadb-git-aeeafbb39656fc4678c72b00f958215754b32dc7.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'storage/myisam/mi_packrec.c')
| -rw-r--r-- | storage/myisam/mi_packrec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c index 0ba495fdd68..d8d892a5bc9 100644 --- a/storage/myisam/mi_packrec.c +++ b/storage/myisam/mi_packrec.c @@ -1051,8 +1051,7 @@ static void uf_blob(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, } decode_bytes(rec,bit_buff,bit_buff->blob_pos,bit_buff->blob_pos+length); _my_store_blob_length((uchar*) to,pack_length,length); - memcpy_fixed((char*) to+pack_length,(char*) &bit_buff->blob_pos, - sizeof(char*)); + memcpy((char*) to+pack_length, &bit_buff->blob_pos, sizeof(char*)); bit_buff->blob_pos+=length; } } |