diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-06 13:47:57 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-03-06 13:47:57 +0100 |
| commit | 3053c1110a3ff9ab4b86d3def4db019d9374acaa (patch) | |
| tree | 6183377281b4be8088dffc147181b93469c25289 /storage/myisam | |
| parent | 56093e64f17a035db29f11d835534bff3e7f8fb7 (diff) | |
| parent | 268bf557a998c4933d4483e1368be9ef43755f23 (diff) | |
| download | mariadb-git-3053c1110a3ff9ab4b86d3def4db019d9374acaa.tar.gz | |
Merge 5.1 => 5.5
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_dynrec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c index 6ebbe983938..6acee89b0a8 100644 --- a/storage/myisam/mi_dynrec.c +++ b/storage/myisam/mi_dynrec.c @@ -117,7 +117,7 @@ int mi_munmap_file(MI_INFO *info) { int ret; DBUG_ENTER("mi_unmap_file"); - if ((ret= my_munmap(info->s->file_map, info->s->mmaped_length))) + if ((ret= my_munmap((void*) info->s->file_map, info->s->mmaped_length))) DBUG_RETURN(ret); info->s->file_read= mi_nommap_pread; info->s->file_write= mi_nommap_pwrite; |