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

Signed-off-by: Monty <monty@mariadb.org>

5 files changed, 9 insertions, 9 deletions

diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index 67e27dd9b81..ce46b979f92 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -7960,7 +7960,7 @@ int ha_spider::cmp_ref(
       *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",
                            (*field)->field_name.str));
diff --git a/storage/spider/hs_client/config.cpp b/storage/spider/hs_client/config.cpp
index 030571f9d85..97d479220e0 100644
--- a/storage/spider/hs_client/config.cpp
+++ b/storage/spider/hs_client/config.cpp
@@ -263,7 +263,7 @@ parse_args(int argc, char **argv, config& conf)
     }
     if (!(param = new conf_param()))
       continue;
-    uint32 key_len = eq - arg;
+    uint32 key_len = (uint32)(eq - arg);
     uint32 val_len = strlen(eq + 1);
     if (
       param->key.reserve(key_len + 1) ||
diff --git a/storage/spider/hs_client/hstcpcli.cpp b/storage/spider/hs_client/hstcpcli.cpp
index d6bdc098438..2cb37c7be9d 100644
--- a/storage/spider/hs_client/hstcpcli.cpp
+++ b/storage/spider/hs_client/hstcpcli.cpp
@@ -497,7 +497,7 @@ hstcpcli::response_recv(size_t& num_flds_r)
     char *const err_begin = start;
     read_token(start, finish);
     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()) {
       e = String("unknown_error", &my_charset_bin);
     }
diff --git a/storage/spider/hs_client/socket.cpp b/storage/spider/hs_client/socket.cpp
index 7530bb12239..45b8100e64c 100644
--- a/storage/spider/hs_client/socket.cpp
+++ b/storage/spider/hs_client/socket.cpp
@@ -224,7 +224,7 @@ socket_set_options(auto_file& fd, const socket_args& args, String& err_r)
 int
 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) {
     return errno_string("socket", errno, err_r);
   }
@@ -254,7 +254,7 @@ socket_connect(auto_file& fd, const socket_args& args, String& err_r)
 int
 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) {
     return errno_string("socket", errno, err_r);
   }
@@ -301,8 +301,8 @@ int
 socket_accept(int listen_fd, auto_file& fd, const socket_args& args,
   sockaddr_storage& addr_r, socklen_t& addrlen_r, String& err_r)
 {
-  fd.reset(accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r),
-    &addrlen_r));
+  fd.reset((int) accept(listen_fd, reinterpret_cast<sockaddr *>(&addr_r),
+                        &addrlen_r));
   if (fd.get() < 0) {
     return errno_string("accept", errno, err_r);
   }
diff --git a/storage/spider/spd_sys_table.cc b/storage/spider/spd_sys_table.cc
index a966cd32857..85565c79f6e 100644
--- a/storage/spider/spd_sys_table.cc
+++ b/storage/spider/spd_sys_table.cc
@@ -719,13 +719,13 @@ void spider_store_tables_name(
   }
   table->field[0]->store(
     ptr_db,
-    ptr_diff_table - 1,
+    (uint)(ptr_diff_table - 1),
     system_charset_info);
   DBUG_PRINT("info",("spider field[0]->null_bit = %d",
     table->field[0]->null_bit));
   table->field[1]->store(
     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);
   DBUG_PRINT("info",("spider field[1]->null_bit = %d",
     table->field[1]->null_bit));