diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index d931b251bfd..3f1509ebe7d 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -153,7 +153,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
         line options.
       */
 
-#if MYSQL_PORT_DEFAULT == 0
+#if 0 // MYSQL_PORT_DEFAULT == 0
       if ((serv_ptr= getservbyname("mysql", "tcp")))
         mysql_port= (uint) ntohs((ushort) serv_ptr->s_port);
 #endif
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 09d8b4b7d1c..63abee82d0e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2158,7 +2158,7 @@ static void set_ports()
       line options.
     */
 
-#if MYSQL_PORT_DEFAULT == 0
+#if 0 // MYSQL_PORT_DEFAULT == 0
     struct  servent *serv_ptr;
     if ((serv_ptr= getservbyname("mysql", "tcp")))
       SYSVAR_AUTOSIZE(mysqld_port, ntohs((u_short) serv_ptr->s_port));
diff --git a/storage/innobase/ut/ut0crc32.cc b/storage/innobase/ut/ut0crc32.cc
index 4a6447c1dcf..56a6d74fd25 100644
--- a/storage/innobase/ut/ut0crc32.cc
+++ b/storage/innobase/ut/ut0crc32.cc
@@ -220,11 +220,7 @@ ut_crc32_8_hw(
 #ifdef _MSC_VER
 	*crc = _mm_crc32_u8(*crc, (*data)[0]);
 #else
-	asm("crc32b %1, %0"
-	    /* output operands */
-	    : "+r" (*crc)
-	    /* input operands */
-	    : "rm" ((*data)[0]));
+	*crc = __builtin_ia32_crc32qi(*crc, (*data)[0]);
 #endif
 
 	(*data)++;
@@ -241,8 +237,8 @@ ut_crc32_64_low_hw(
 	uint32_t	crc,
 	uint64_t	data)
 {
-	uint64_t	crc_64bit = crc;
 #ifdef _MSC_VER
+	uint64_t	crc_64bit = crc;
 #ifdef _M_X64
 	crc_64bit = _mm_crc32_u64(crc_64bit, data);
 #elif defined(_M_IX86)
@@ -251,15 +247,11 @@ ut_crc32_64_low_hw(
 #else
 #error Not Supported processors type.
 #endif
+	return(static_cast<uint32_t>(crc_64bit));
 #else
-	asm("crc32q %1, %0"
-	    /* output operands */
-	    : "+r" (crc_64bit)
-	    /* input operands */
-	    : "rm" (data));
+	return static_cast<uint32_t>(__builtin_ia32_crc32di(crc, data));
 #endif
 
-	return(static_cast<uint32_t>(crc_64bit));
 }
 
 /** Calculate CRC32 over 64-bit byte string using a hardware/CPU instruction.
diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
index 24bc04c75ba..0d657bbe05d 100644
--- a/tpool/aio_linux.cc
+++ b/tpool/aio_linux.cc
@@ -45,6 +45,7 @@ class aio_linux : public aio
   std::thread m_getevent_thread;
 
   static void getevent_thread_routine(aio_linux* aio)
+  __attribute__((no_sanitize("memory")))
   {
     for (;;)
     {
diff --git a/libmariadb/libmariadb/mariadb_lib.c b/libmariadb/libmariadb/mariadb_lib.c
index 4c1108b..f3ddc9e 100644
--- a/libmariadb/libmariadb/mariadb_lib.c
+++ b/libmariadb/libmariadb/mariadb_lib.c
@@ -3572,12 +3572,9 @@ static void mysql_once_init()
   }
   if (!mysql_port)
   {
-    struct servent *serv_ptr;
     char *env;
 
     mysql_port = MARIADB_PORT;
-    if ((serv_ptr = getservbyname("mysql", "tcp")))
-      mysql_port = (uint)ntohs((ushort)serv_ptr->s_port);
     if ((env = getenv("MYSQL_TCP_PORT")))
       mysql_port =(uint)atoi(env);
   }
diff --git a/extra/wolfssl/wolfssl/wolfcrypt/src/random.c b/extra/wolfssl/wolfssl/wolfcrypt/src/random.c
index 6b0d5dafc..fefb459a2 100644
--- a/extra/wolfssl/wolfssl/wolfcrypt/src/random.c
+++ b/extra/wolfssl/wolfssl/wolfcrypt/src/random.c
@@ -1286,6 +1286,7 @@ int wc_FreeNetRandom(void)
 
     /* return 0 on success */
     static WC_INLINE int IntelRDseed64(word64* seed)
+    __attribute__((no_sanitize("memory")))
     {
         unsigned char ok;