Bug#29041505 BACKPORT TO 5.7: BUNDLED LIBEVENT IS OUTDATED

This is a backport from 8.0, updated libevent to 2.1.8

Change-Id: Id42e713576e92696a9f226bb20df302d13d9ea47

Author: Tor Didriksen

client/base/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
 
 ADD_DEFINITIONS(${SSL_DEFINES})
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 ADD_CONVENIENCE_LIBRARY(client_base
   i_option.cc
   bool_option.cc

client/dump/CMakeLists.txt

@@ -13,6 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/dump
 )

cmake/libevent.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,16 +14,14 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 MACRO (MYSQL_USE_BUNDLED_LIBEVENT)
-  SET(LIBEVENT_LIBRARY  event)
-  SET(LIBEVENT_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/libevent)
+  SET(WITH_LIBEVENT "bundled" CACHE STRING "Use bundled libevent library")
+  SET(LIBEVENT_LIBRARIES  event)
+  SET(LIBEVENT_INCLUDE_DIRS
+    "${CMAKE_SOURCE_DIR}/extra/libevent/include"
+    "${CMAKE_BINARY_DIR}/extra/libevent/include")
   SET(LIBEVENT_FOUND  TRUE)
-  ADD_DEFINITIONS("-DHAVE_LIBEVENT1")
-  SET(WITH_LIBEVENT "bundled" CACHE STRING "Use bundled libevent")
-  ADD_SUBDIRECTORY(libevent)
-  GET_TARGET_PROPERTY(src libevent SOURCES)
-  FOREACH(file ${src})
-    SET(LIBEVENT_SOURCES ${LIBEVENT_SOURCES} ${CMAKE_SOURCE_DIR}/libevent/${file})
-  ENDFOREACH()
+  ADD_DEFINITIONS("-DHAVE_LIBEVENT2")
+  ADD_SUBDIRECTORY(extra/libevent)
 ENDMACRO()
 
 # MYSQL_CHECK_LIBEVENT
@@ -33,7 +31,7 @@ ENDMACRO()
 # If this is set,we use bindled libevent
 # If this is not set,search for system libevent. 
 # if system libevent is not found, use bundled copy
-# LIBEVENT_LIBRARIES, LIBEVENT_INCLUDE_DIR and LIBEVENT_SOURCES
+# LIBEVENT_LIBRARIES, LIBEVENT_INCLUDE_DIRS
 # are set after this macro has run
 
 MACRO (MYSQL_CHECK_LIBEVENT)
@@ -48,43 +46,43 @@ MACRO (MYSQL_CHECK_LIBEVENT)
     SET(LIBEVENT_FIND_QUIETLY TRUE)
 
     IF (NOT LIBEVENT_INCLUDE_PATH)
-      set(LIBEVENT_INCLUDE_PATH /usr/local/include /opt/local/include)
+      SET(LIBEVENT_INCLUDE_PATH /usr/local/include /opt/local/include)
     ENDIF()
 
-    find_path(LIBEVENT_INCLUDE_DIR event.h PATHS ${LIBEVENT_INCLUDE_PATH})
+    FIND_PATH(LIBEVENT_INCLUDE_DIR event.h PATHS ${LIBEVENT_INCLUDE_PATH})
 
-    if (NOT LIBEVENT_INCLUDE_DIR)
+    IF (NOT LIBEVENT_INCLUDE_DIR)
         MESSAGE(SEND_ERROR "Cannot find appropriate event.h in /usr/local/include or /opt/local/include. Use bundled libevent")
-    endif() 
+    ENDIF()
 
     IF (NOT LIBEVENT_LIB_PATHS) 
-      set(LIBEVENT_LIB_PATHS /usr/local/lib /opt/local/lib)
+      SET(LIBEVENT_LIB_PATHS /usr/local/lib /opt/local/lib)
     ENDIF()
 
     ## libevent.so is historical, use libevent_core.so if found.
-    find_library(LIBEVENT_CORE event_core PATHS ${LIBEVENT_LIB_PATHS})
-    find_library(LIBEVENT_LIB event PATHS ${LIBEVENT_LIB_PATHS})
+    FIND_LIBRARY(LIBEVENT_CORE event_core PATHS ${LIBEVENT_LIB_PATHS})
+    FIND_LIBRARY(LIBEVENT_EXTRA event_extra PATHS ${LIBEVENT_LIB_PATHS})
+    FIND_LIBRARY(LIBEVENT_LIB event PATHS ${LIBEVENT_LIB_PATHS})
 
-    if (NOT LIBEVENT_LIB AND NOT LIBEVENT_CORE)
+    IF (NOT LIBEVENT_LIB AND NOT LIBEVENT_CORE)
         MESSAGE(SEND_ERROR "Cannot find appropriate event lib in /usr/local/lib or /opt/local/lib. Use bundled libevent")
-    endif() 
+    ENDIF()
 
     IF ((LIBEVENT_LIB OR LIBEVENT_CORE) AND LIBEVENT_INCLUDE_DIR)
-      set(LIBEVENT_FOUND TRUE)
+      SET(LIBEVENT_FOUND TRUE)
       IF (LIBEVENT_CORE)
-        set(LIBEVENT_LIBS ${LIBEVENT_CORE})
+        SET(LIBEVENT_LIBS ${LIBEVENT_CORE} ${LIBEVENT_EXTRA})
       ELSE()
-        set(LIBEVENT_LIBS ${LIBEVENT_LIB})
+        SET(LIBEVENT_LIBS ${LIBEVENT_LIB})
       ENDIF()
     ELSE()
-      set(LIBEVENT_FOUND FALSE)
+      SET(LIBEVENT_FOUND FALSE)
     ENDIF()
 
     IF(LIBEVENT_FOUND)
-      SET(LIBEVENT_SOURCES "")
       SET(LIBEVENT_LIBRARIES ${LIBEVENT_LIBS})
       SET(LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIR})
-      find_path(LIBEVENT2_INCLUDE_DIR event2 HINTS ${LIBEVENT_INCLUDE_PATH}/event)
+      FIND_PATH(LIBEVENT2_INCLUDE_DIR event2 HINTS ${LIBEVENT_INCLUDE_PATH}/event)
       IF (LIBEVENT2_INCLUDE_DIR)
         ADD_DEFINITIONS("-DHAVE_LIBEVENT2")
       ELSE()
@@ -98,4 +96,6 @@ MACRO (MYSQL_CHECK_LIBEVENT)
     ENDIF()
 
   ENDIF()
+  MESSAGE(STATUS "LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIRS}")
+  MESSAGE(STATUS "LIBEVENT_LIBRARIES ${LIBEVENT_LIBRARIES}")
 ENDMACRO()

extra/libevent/.clang-format

@@ -0,0 +1,63 @@
+---
+Language:          Cpp
+BasedOnStyle:      LLVM
+
+AccessModifierOffset: -4
+
+AlignAfterOpenBracket: DontAlign
+AlignEscapedNewlinesLeft: true
+# AlignOperands: true
+AlignTrailingComments: true
+
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+
+# BinPackArguments: false
+# BinPackParameters: true
+
+BreakBeforeBinaryOperators: false
+BreakBeforeBraces: Custom
+BraceWrapping: { AfterFunction: true }
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+
+ColumnLimit:     80
+
+ContinuationIndentWidth: 4
+
+DerivePointerAlignment: false #XXX
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false #XXX
+ForEachMacros:   [ LIST_FOREACH, SIMPLEQ_FOREACH, CIRCLEQ_FOREACH, TAILQ_FOREACH, TAILQ_FOREACH_REVERSE, HT_FOREACH ]
+
+IndentCaseLabels: false
+IndentFunctionDeclarationAfterType: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 2
+
+PointerAlignment: Right #XXX
+
+# SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+Standard:        Cpp03
+TabWidth:        4
+UseTab:          Always
+SortIncludes:    false
+...