diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
| commit | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (patch) | |
| tree | 515c69dbce80f1af73974286de8f87413b1cad23 /storage/myisam/mi_checksum.c | |
| parent | 86901216fd4f7eb0844e884203810a0e43fcd103 (diff) | |
| parent | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (diff) | |
| download | mariadb-git-52dea41052bc1be1efbe59c320046d7e62cfd0a6.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'storage/myisam/mi_checksum.c')
| -rw-r--r-- | storage/myisam/mi_checksum.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c index 4c10b28a653..e0a8672760d 100644 --- a/storage/myisam/mi_checksum.c +++ b/storage/myisam/mi_checksum.c @@ -40,7 +40,8 @@ ha_checksum mi_checksum(MI_INFO *info, const uchar *buf) length=_mi_calc_blob_length(column->length- portable_sizeof_char_ptr, buf); - memcpy(&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: |