Commit 376ca2f6 authored by Monty's avatar Monty

Fixed compiler warnings

parent 12615706
...@@ -2298,7 +2298,7 @@ ds_ctxt_t::make_hardlink(const char *from_path, const char *to_path) ...@@ -2298,7 +2298,7 @@ ds_ctxt_t::make_hardlink(const char *from_path, const char *to_path)
} }
else else
{ {
strncpy(to_path_full, to_path, sizeof(to_path_full)); strmake(to_path_full, to_path, sizeof(to_path_full)-1);
} }
#ifdef _WIN32 #ifdef _WIN32
return CreateHardLink(to_path_full, from_path, NULL); return CreateHardLink(to_path_full, from_path, NULL);
......
...@@ -168,7 +168,12 @@ int Url_http::send(const char* data, size_t data_length) ...@@ -168,7 +168,12 @@ int Url_http::send(const char* data, size_t data_length)
char buf[1024]; char buf[1024];
size_t len= 0; size_t len= 0;
addrinfo *addrs, *addr, filter= {0, AF_UNSPEC, SOCK_STREAM, 6, 0, 0, 0, 0}; addrinfo *addrs, *addr, filter;
bzero((void*) &filter, sizeof(filter));
filter.ai_family= AF_UNSPEC;
filter.ai_socktype= SOCK_STREAM;
filter.ai_protocol=6;
int res= use_proxy() ? int res= use_proxy() ?
getaddrinfo(proxy_host.str, proxy_port.str, &filter, &addrs) : getaddrinfo(proxy_host.str, proxy_port.str, &filter, &addrs) :
getaddrinfo(host.str, port.str, &filter, &addrs); getaddrinfo(host.str, port.str, &filter, &addrs);
......
...@@ -1679,6 +1679,7 @@ fseg_create(fil_space_t *space, ulint byte_offset, mtr_t *mtr, dberr_t *err, ...@@ -1679,6 +1679,7 @@ fseg_create(fil_space_t *space, ulint byte_offset, mtr_t *mtr, dberr_t *err,
ut_ad(byte_offset >= FIL_PAGE_DATA); ut_ad(byte_offset >= FIL_PAGE_DATA);
ut_ad(byte_offset + FSEG_HEADER_SIZE ut_ad(byte_offset + FSEG_HEADER_SIZE
<= srv_page_size - FIL_PAGE_DATA_END); <= srv_page_size - FIL_PAGE_DATA_END);
buf_block_t* iblock= 0;
mtr->x_lock_space(space); mtr->x_lock_space(space);
ut_d(space->modify_check(*mtr)); ut_d(space->modify_check(*mtr));
...@@ -1691,8 +1692,6 @@ fseg_create(fil_space_t *space, ulint byte_offset, mtr_t *mtr, dberr_t *err, ...@@ -1691,8 +1692,6 @@ fseg_create(fil_space_t *space, ulint byte_offset, mtr_t *mtr, dberr_t *err,
goto funct_exit; goto funct_exit;
} }
buf_block_t* iblock;
inode_alloc: inode_alloc:
inode = fsp_alloc_seg_inode(space, header, &iblock, mtr, err); inode = fsp_alloc_seg_inode(space, header, &iblock, mtr, err);
......
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