PS-8330: Resolving conflicts & fixing issues

.gitignore

@@ -18,13 +18,10 @@ source_downloads
 
 # Configuration files for Visual Studio Code
 .vscode/
-<<<<<<< HEAD
 
 /GPATH
 /GRTAGS
 /GTAGS
-||||||| 8d8c986e571
-=======
 
 build/
 datatool/
@@ -34,4 +31,3 @@ heatwaveml.*
 automl.egg-info/
 _userconf.sh
 scalability_jobs_*
->>>>>>> mysql-8.0.30

CMakeLists.txt

@@ -1387,20 +1387,10 @@ IF (USE_LD_GOLD AND NOT (C_LD_LLD_RESULT AND CXX_LD_LLD_RESULT))
   CMAKE_POP_CHECK_STATE()
 ENDIF()
 
-<<<<<<< HEAD
 # Linker/binutils bug in Fedora 28, Ubuntu 16.04, Debian 8 and Debian 9,
 # undefined reference to symbol '__bss_start'
 # Fedora 34: undefined reference to symbol 'crc32_z@@ZLIB_1.2.9'
-IF(LINUX_FEDORA_28 OR LINUX_FEDORA_34 OR LINUX_UBUNTU_16_04 OR LINUX_DEBIAN_8 OR LINUX_DEBIAN_9)
-||||||| 8d8c986e571
-# Linker/binutils bug in Fedora 28, undefined reference to symbol '__bss_start'
-# Similar bug on 32bit Ubuntu.
-# Fedora 34: undefined reference to symbol 'crc32_z@@ZLIB_1.2.9'
-IF(LINUX_FEDORA_28 OR LINUX_FEDORA_34 OR LINUX_UBUNTU_16_04)
-=======
-# Fedora 34, RHEL9: undefined reference to symbol 'crc32_z@@ZLIB_1.2.9'
-IF(LINUX_FEDORA_34 OR LINUX_RHEL9)
->>>>>>> mysql-8.0.30
+IF(LINUX_FEDORA_34 OR LINUX_RHEL9 OR LINUX_DEBIAN_8 OR LINUX_DEBIAN_9)
   IF(NOT CMAKE_CXX_LINK_FLAGS MATCHES "-fuse-ld=lld" AND
       NOT CMAKE_CXX_LINK_FLAGS MATCHES "-fuse-ld=gold")
     STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -Wl,--copy-dt-needed-entries")

MYSQL_VERSION

@@ -1,12 +1,4 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-<<<<<<< HEAD
-MYSQL_VERSION_PATCH=29
-MYSQL_VERSION_EXTRA=-21
-||||||| 8d8c986e571
-MYSQL_VERSION_PATCH=29
-MYSQL_VERSION_EXTRA=
-=======
 MYSQL_VERSION_PATCH=30
-MYSQL_VERSION_EXTRA=
->>>>>>> mysql-8.0.30
+MYSQL_VERSION_EXTRA=-22

cmake/readline.cmake

@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-# Copyright (c) 2009, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2022, Oracle and/or its affiliates.
 #
 # Copyright (c) 2009, 2019, Oracle and/or its affiliates.
-||||||| 8d8c986e571
-# Copyright (c) 2009, 2021, Oracle and/or its affiliates.
-=======
-# Copyright (c) 2009, 2022, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.30
 # 
 # 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,
@@ -310,16 +304,7 @@ MACRO (MYSQL_CHECK_EDITLINE)
     ELSEIF(WITH_EDITLINE STREQUAL "system")
       FIND_SYSTEM_EDITLINE()
       IF(NOT EDITLINE_FOUND)
-<<<<<<< HEAD
-        MESSAGE(FATAL_ERROR "Cannot find system editline libraries.")
-      ELSE()
-        SET(MY_READLINE_INCLUDE_DIR ${EDITLINE_INCLUDE_DIR})
-        SET(MY_READLINE_LIBRARY ${EDITLINE_LIBRARY})
-||||||| 8d8c986e571
-        MESSAGE(FATAL_ERROR "Cannot find system editline libraries.") 
-=======
         RESET_EDITLINE_VARIABLES()
->>>>>>> mysql-8.0.30
       ENDIF()
     ELSE()
       MESSAGE(FATAL_ERROR "WITH_EDITLINE must be bundled or system")

cmake/ssl.cmake

@@ -371,76 +371,7 @@ MACRO (MYSQL_CHECK_SSL)
                  HINTS ${OPENSSL_ROOT_DIR}/lib ${OPENSSL_ROOT_DIR}/lib64)
 
     IF(OPENSSL_INCLUDE_DIR)
-<<<<<<< HEAD
-      FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-        OPENSSL_MAJOR_VERSION
-        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MAJOR[\t ]+[0-9].*"
-        )
-      IF(OPENSSL_MAJOR_VERSION STREQUAL "")
-        # Verify version number. Version information looks like:
-        #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
-        # Encoded as MNNFFPPS: major minor fix patch status
-        FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-          OPENSSL_VERSION_NUMBER
-          REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-          )
-        STRING(REGEX REPLACE
-          "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-          OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-          )
-        STRING(REGEX REPLACE
-          "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
-          OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-          )
-        STRING(REGEX REPLACE
-          "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
-          OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-          )
-      ELSE()
-        STRING(REGEX REPLACE
-          "^.*OPENSSL_VERSION_MAJOR[\t ]+([0-9]).*$" "\\1"
-          OPENSSL_MAJOR_VERSION "${OPENSSL_MAJOR_VERSION}"
-          )
-        FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-          OPENSSL_MINOR_VERSION
-          REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MINOR[\t ]+[0-9].*"
-          )
-        STRING(REGEX REPLACE
-          "^.*OPENSSL_VERSION_MINOR[\t ]+([0-9]).*$" "\\1"
-          OPENSSL_MINOR_VERSION "${OPENSSL_MINOR_VERSION}"
-          )
-        FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-          OPENSSL_FIX_VERSION
-          REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_PATCH[\t ]+[0-9].*"
-          )
-        STRING(REGEX REPLACE
-          "^.*OPENSSL_VERSION_PATCH[\t ]+([0-9]).*$" "\\1"
-          OPENSSL_FIX_VERSION "${OPENSSL_FIX_VERSION}"
-          )
-      ENDIF()
-||||||| 8d8c986e571
-      # Verify version number. Version information looks like:
-      #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
-      # Encoded as MNNFFPPS: major minor fix patch status
-      FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-        OPENSSL_VERSION_NUMBER
-        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-        )
-      STRING(REGEX REPLACE
-        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-        OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-        )
-      STRING(REGEX REPLACE
-        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
-        OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-        )
-      STRING(REGEX REPLACE
-        "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
-        OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-        )
-=======
       FIND_OPENSSL_VERSION()
->>>>>>> mysql-8.0.30
     ENDIF()
     IF (OPENSSL_MAJOR_MINOR_FIX_VERSION VERSION_LESS
         ${MIN_OPENSSL_VERSION_REQUIRED})
@@ -452,27 +383,10 @@ MACRO (MYSQL_CHECK_SSL)
     IF("${OPENSSL_MAJOR_MINOR_FIX_VERSION}" VERSION_GREATER "1.1.0")
        ADD_DEFINITIONS(-DHAVE_TLSv13)
     ENDIF()
-<<<<<<< HEAD
-    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "3.0.0")
-       ADD_DEFINITIONS(-DOPENSSL_SUPPRESS_DEPRECATED)
-    ENDIF()
-||||||| 8d8c986e571
-=======
 
->>>>>>> mysql-8.0.30
     IF(OPENSSL_INCLUDE_DIR AND
-<<<<<<< HEAD
-       OPENSSL_LIBRARY   AND
-       CRYPTO_LIBRARY      AND
-       (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "3")
-||||||| 8d8c986e571
-       OPENSSL_LIBRARY   AND
-       CRYPTO_LIBRARY      AND
-       OPENSSL_MAJOR_VERSION STREQUAL "1"
-=======
        OPENSSL_LIBRARY     AND
        CRYPTO_LIBRARY
->>>>>>> mysql-8.0.30
       )
       SET(OPENSSL_FOUND TRUE)
       IF(WITH_SSL_PATH)