diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
| commit | b838d081ad346e52787753b1799c627922c4a6c7 (patch) | |
| tree | dc8f1e21e6b40d5b72668571c570c9a3214fbf32 /storage/myisam/mi_packrec.c | |
| parent | 824db55ce53963a64fcf648b54500df22c57e9b2 (diff) | |
| parent | 72c36f4415815d55ddb82b23682f3c549906c00e (diff) | |
| download | mariadb-git-b838d081ad346e52787753b1799c627922c4a6c7.tar.gz | |
mysql-5.5.33 merge
Diffstat (limited to 'storage/myisam/mi_packrec.c')
| -rw-r--r-- | storage/myisam/mi_packrec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c index 7e2403b64c9..f0a4d764e7a 100644 --- a/storage/myisam/mi_packrec.c +++ b/storage/myisam/mi_packrec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1052,7 +1052,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); _mi_store_blob_length((uchar*) to,pack_length,length); - memcpy((char*) to+pack_length, &bit_buff->blob_pos, sizeof(char*)); + memcpy(to+pack_length, &bit_buff->blob_pos, sizeof(char*)); bit_buff->blob_pos+=length; } } |