Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: I05dd677000fed8778e6d9788545bf06df6a37027

Author: Tor Didriksen

cmake/bison.cmake

@@ -98,6 +98,18 @@ IF(WIN32 AND NOT DEFINED BISON_EXECUTABLE)
     NO_DEFAULT_PATH
     PATHS ${NATIVE_BISON_PATHS}
     )
+  # Look for Flex also, we may need it later.
+  IF(BISON_EXECUTABLE)
+    FIND_PROGRAM(FLEX_EXECUTABLE
+      NAMES flex win-flex win_flex
+      NO_DEFAULT_PATH
+      PATHS ${NATIVE_BISON_PATHS}
+      )
+    FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h
+      NO_DEFAULT_PATH
+      PATHS ${NATIVE_BISON_PATHS}
+      )
+  ENDIF()
 ENDIF()
 
 FIND_PACKAGE(BISON)

sql/CMakeLists.txt

@@ -894,6 +894,13 @@ IF(WIN32 AND NOT WIN32_CLANG)
     COMPILE_FLAGS "/d2OptimizeHugeFunctions")
 ENDIF()
 
+# 'yyexhtaustedlab': unreferenced label
+IF(WIN32 AND NOT WIN32_CLANG)
+  ADD_COMPILE_FLAGS(${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
+                    ${CMAKE_CURRENT_BINARY_DIR}/sql_hints.yy.cc
+                    COMPILE_FLAGS "/wd4102")
+ENDIF()
+
 # Common for all versions of GCC/Clang
 # Bison output uses undefined symbols in #if checks
 IF(MY_COMPILER_IS_GNU_OR_CLANG)