database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity

Changes to fix 64-bit Windows build errors and warnings.

Browse Source 
Signed-off-by: Monty <monty@mariadb.org>
This commit is contained in:
Jacob Mathew
2017-11-28 22:42:59 +02:00
committed by Monty
parent 207594afac
commit bfaf2d6e35
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/spider/ha_spider.cc
View File

@@ -7960,7 +7960,7 @@ int ha_spider::cmp_ref(
*field; *field;
field++ field++
) { ) {
if ((ret = (*field)->cmp_binary_offset(ptr_diff))) if ((ret = (*field)->cmp_binary_offset((uint) ptr_diff)))
{ {
DBUG_PRINT("info",("spider different at %s", DBUG_PRINT("info",("spider different at %s",
(*field)->field_name.str)); (*field)->field_name.str));

2
storage/spider/hs_client/config.cpp
View File

@@ -263,7 +263,7 @@ parse_args(int argc, char **argv, config& conf)
} }
if (!(param = new conf_param())) if (!(param = new conf_param()))
continue; continue;
uint32 key_len = eq - arg; uint32 key_len = (uint32)(eq - arg);
uint32 val_len = strlen(eq + 1); uint32 val_len = strlen(eq + 1);
if ( if (
param->key.reserve(key_len + 1) || param->key.reserve(key_len + 1) ||

2
storage/spider/hs_client/hstcpcli.cpp
View File

@@ -497,7 +497,7 @@ hstcpcli::response_recv(size_t& num_flds_r)
char *const err_begin = start; char *const err_begin = start;
read_token(start, finish); read_token(start, finish);
char *const err_end = start; char *const err_end = start;
String e = String(err_begin, err_end - err_begin, &my_charset_bin); String e = String(err_begin, (uint32)(err_end - err_begin), &my_charset_bin);
if (!e.length()) { if (!e.length()) {
e = String("unknown_error", &my_charset_bin); e = String("unknown_error", &my_charset_bin);
} }

8
storage/spider/hs_client/socket.cpp
View File

@@ -224,7 +224,7 @@ socket_set_options(auto_file& fd, const socket_args& args, String& err_r)
int int
socket_open(auto_file& fd, const socket_args& args, String& err_r) socket_open(auto_file& fd, const socket_args& args, String& err_r)
{ {
fd.reset(socket(args.family, args.socktype, args.protocol)); fd.reset((int) socket(args.family, args.socktype, args.protocol));
if (fd.get() < 0) { if (fd.get() < 0) {
return errno_string("socket", errno, err_r); return errno_string("socket", errno, err_r);
} }
@@ -254,7 +254,7 @@ socket_connect(auto_file& fd, const socket_args& args, String& err_r)
int int
socket_bind(auto_file& fd, const socket_args& args, String& err_r) socket_bind(auto_file& fd, const socket_args& args, String& err_r)
{ {
fd.reset(socket(args.family, args.socktype, args.protocol)); fd.reset((int) socket(args.family, args.socktype, args.protocol));
if (fd.get() < 0) { if (fd.get() < 0) {
return errno_string("socket", errno, err_r); return errno_string("socket", errno, err_r);
} }
@@ -301,8 +301,8 @@ int
socket_accept(int listen_fd, auto_file& fd, const socket_args& args, socket_accept(int listen_fd, auto_file& fd, const socket_args& args,
sockaddr_storage& addr_r, socklen_t& addrlen_r, String& err_r) sockaddr_storage& addr_r, socklen_t& addrlen_r, String& err_r)
{ {
fd.reset(accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r), fd.reset((int) accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r),
&addrlen_r)); &addrlen_r));
if (fd.get() < 0) { if (fd.get() < 0) {
return errno_string("accept", errno, err_r); return errno_string("accept", errno, err_r);
} }

4
storage/spider/spd_sys_table.cc
View File

@@ -719,13 +719,13 @@ void spider_store_tables_name(
} }
table->field[0]->store( table->field[0]->store(
ptr_db, ptr_db,
ptr_diff_table - 1, (uint)(ptr_diff_table - 1),
system_charset_info); system_charset_info);
DBUG_PRINT("info",("spider field[0]->null_bit = %d", DBUG_PRINT("info",("spider field[0]->null_bit = %d",
table->field[0]->null_bit)); table->field[0]->null_bit));
table->field[1]->store( table->field[1]->store(
ptr_table, ptr_table,
name_length - ptr_diff_db - ptr_diff_table, (uint) ((my_ptrdiff_t) name_length - ptr_diff_db - ptr_diff_table),
system_charset_info); system_charset_info);
DBUG_PRINT("info",("spider field[1]->null_bit = %d", DBUG_PRINT("info",("spider field[1]->null_bit = %d",
table->field[1]->null_bit)); table->field[1]->null_bit));