Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

5 files changed, 9 insertions, 9 deletions

diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
index 7ed8661cc74..8d7064a16f9 100644
--- a/storage/spider/ha_spider.cc
+++ b/storage/spider/ha_spider.cc
@@ -7793,7 +7793,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 b546230ca03..3bf0f3e5bdf 100644
--- a/storage/spider/hs_client/config.cpp
+++ b/storage/spider/hs_client/config.cpp
@@ -263,8 +263,8 @@ parse_args(int argc, char **argv, config& conf)
     }
     if (!(param = new conf_param()))
       continue;
-    uint32 key_len = eq - arg;
-    uint32 val_len = strlen(eq + 1);
+    uint32 key_len = (uint32)(eq - arg);
+    uint32 val_len = (uint32)(strlen(eq + 1));
     if (
       param->key.reserve(key_len + 1) ||
       param->val.reserve(val_len + 1)
diff --git a/storage/spider/hs_client/hstcpcli.cpp b/storage/spider/hs_client/hstcpcli.cpp
index fed87803f9c..60da87b9f20 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 c61b39d140f..0717acf0da1 100644
--- a/storage/spider/hs_client/socket.cpp
+++ b/storage/spider/hs_client/socket.cpp
@@ -223,7 +223,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);
   }
@@ -253,7 +253,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);
   }
@@ -300,7 +300,7 @@ 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),
+  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 a140fba7915..f0d24f37d6d 100644
--- a/storage/spider/spd_sys_table.cc
+++ b/storage/spider/spd_sys_table.cc
@@ -677,13 +677,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)(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));