diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-13 10:39:24 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-13 10:39:24 +0200 |
| commit | f45523188e57575eeed5f7fbe8fbefc06de4b6f3 (patch) | |
| tree | 74d63cef81d432cda2315d47976755590872f3bd /mysys/mf_iocache.c | |
| parent | 7f0f32d659c5e3eff1d6ed6249cad59ff6df5723 (diff) | |
| parent | 071636d6fa25909510e3d222d2ed1d919625f55d (diff) | |
| download | mariadb-git-f45523188e57575eeed5f7fbe8fbefc06de4b6f3.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index b7fe36ac049..4902a5a8bce 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1875,7 +1875,7 @@ int end_io_cache(IO_CACHE *info) info->alloced_buffer=0; if (info->file != -1) /* File doesn't exist */ error= my_b_flush_io_cache(info,1); - my_free((uchar*) info->buffer,MYF(MY_WME)); + my_free(info->buffer); info->buffer=info->read_pos=(uchar*) 0; } if (info->type == SEQ_READ_APPEND) @@ -1961,7 +1961,7 @@ int main(int argc, char** argv) total_bytes += 4+block_size; } close_file(&sra_cache); - my_free(block,MYF(MY_WME)); + my_free(block); if (!my_stat(fname,&status,MYF(MY_WME))) die("%s failed to stat, but I had just closed it,\ wonder how that happened"); |