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

jdduncan · jdduncan · commit c539f11aa5d3 · 2023-09-21T09:25:18.000-07:00
diff --git a/storage/ndb/CMakeLists.txt b/storage/ndb/CMakeLists.txt
@@ -340,4 +340,5 @@ IF(WITH_NDBAPI_EXAMPLES)
   ADD_SUBDIRECTORY(ndbapi-examples)
 ENDIF()
 
-ADD_SUBDIRECTORY(wix)
+## WiX support disabled for now
+# ADD_SUBDIRECTORY(wix)
