summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_checksum.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-09-06 22:31:30 +0200
committerSergei Golubchik <sergii@pisem.net>2013-09-06 22:31:30 +0200
commitb838d081ad346e52787753b1799c627922c4a6c7 (patch)
treedc8f1e21e6b40d5b72668571c570c9a3214fbf32 /storage/myisam/mi_checksum.c
parent824db55ce53963a64fcf648b54500df22c57e9b2 (diff)
parent72c36f4415815d55ddb82b23682f3c549906c00e (diff)
downloadmariadb-git-b838d081ad346e52787753b1799c627922c4a6c7.tar.gz
mysql-5.5.33 merge
Diffstat (limited to 'storage/myisam/mi_checksum.c')
-rw-r--r--storage/myisam/mi_checksum.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c
index cfaac229717..4c10b28a653 100644
--- a/storage/myisam/mi_checksum.c
+++ b/storage/myisam/mi_checksum.c
@@ -40,8 +40,7 @@ ha_checksum mi_checksum(MI_INFO *info, const uchar *buf)
length=_mi_calc_blob_length(column->length-
portable_sizeof_char_ptr,
buf);
- memcpy((char*) &pos, buf+column->length- portable_sizeof_char_ptr,
- sizeof(char*));
+ memcpy(&pos, buf+column->length- portable_sizeof_char_ptr, sizeof(char*));
break;
}
case FIELD_VARCHAR: