Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

Author: jdduncan

storage/ndb/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2008, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -436,7 +436,8 @@ IF(WITH_NDBAPI_EXAMPLES)
   ADD_SUBDIRECTORY(ndbapi-examples)
 ENDIF()
 
-ADD_SUBDIRECTORY(wix)
+## WiX support disabled for now
+# ADD_SUBDIRECTORY(wix)
 
 IF(WITH_UNIT_TESTS)
   FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/unittest/ndb)