diff --git a/plugin/handler_socket/CMakeLists.txt b/plugin/handler_socket/CMakeLists.txt
index 9e4707a83feec5cc9570a8c33500a47a2cadce68..329ff58d7f269570a7c233fcd064eb8160ce3b99 100644
--- a/plugin/handler_socket/CMakeLists.txt
+++ b/plugin/handler_socket/CMakeLists.txt
@@ -5,7 +5,7 @@ IF(WIN32)
   RETURN()
 ENDIF()
 
-MY_CHECK_AND_SET_COMPILER_FLAG("-Wdeprecated-declarations")
+MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations")
 
 INCLUDE_DIRECTORIES(libhsclient)
 
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
index 771150499033f58ed45727d0fa1feb9c34bcd834..c523ac5270edfddc0b5ec67cacda672c5ff0a78c 100644
--- a/storage/innobase/fts/fts0opt.cc
+++ b/storage/innobase/fts/fts0opt.cc
@@ -2657,7 +2657,7 @@ fts_optimize_new_table(
 			empty_slot = i;
 		} else if (slot->table == table) {
 			/* Already exists in our optimize queue. */
-			ut_ad(slot->table_id = table->id);
+			ut_ad(slot->table_id == table->id);
 			return(FALSE);
 		}
 	}