Commit 46f04a89 authored by calvin's avatar calvin

branches/zip: fix a compiler error and a warning

Both are minor changes:
1) Compiler error introduced in r4072: double ';' at the end.
2) Warning introduced in r3613: \mem\mem0pool.c(481) : 
warning C4098: 'mem_area_free' : 'void' function returning a value

Approved by: Sunny (IM)
parent 69bc83fe
...@@ -1016,7 +1016,7 @@ buf_pool_drop_hash_index(void) ...@@ -1016,7 +1016,7 @@ buf_pool_drop_hash_index(void)
ut_ad(!btr_search_enabled); ut_ad(!btr_search_enabled);
do { do {
buf_chunk_t* chunks = buf_pool->chunks;; buf_chunk_t* chunks = buf_pool->chunks;
buf_chunk_t* chunk = chunks + buf_pool->n_chunks; buf_chunk_t* chunk = chunks + buf_pool->n_chunks;
released_search_latch = FALSE; released_search_latch = FALSE;
......
...@@ -478,7 +478,9 @@ mem_area_free( ...@@ -478,7 +478,9 @@ mem_area_free(
ulint n; ulint n;
if (srv_use_sys_malloc) { if (srv_use_sys_malloc) {
return(free(ptr)); ut_free(ptr);
return;
} }
/* It may be that the area was really allocated from the OS with /* It may be that the area was really allocated from the OS with
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment