Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-34828

Fixup on MDEV-26858 by removing some remnant obsolete code related to spider handlersocket support

Details

    Description

      Like the following and any subsequent changes necessary (e.g. so that it compiles)

      modified   storage/spider/CMakeLists.txt
      @@ -1,6 +1,3 @@
      -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_HANDLERSOCKET")
      -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_HANDLERSOCKET")
      -
       IF(HAVE_WVLA)
         SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-vla")
         SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wno-vla")
      @@ -45,8 +42,6 @@ IF(EXISTS ${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake)
       ELSEIF(PLUGIN_PARTITION MATCHES "^NO$")
         MESSAGE(STATUS "Spider is skipped because partitioning is disabled")
       ELSE()
      -  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/spider/hs_client)
      -
         IF(DEB)
           SET(extra_options COMPONENT spider-engine)
         ELSE()
      

      Attachments

        Activity

          ycp Yuchen Pei added a comment -

          Hi holyfoot, ptal thanks:

          0551b09871b upstream/bb-10.5-spider-fixup [fixup] Remove some obsolete cmake code related to the removed spider handlersocket support
          

          The reason that I opened an issue and requested review to this otherwise trivial patch is that I am not 100% sure about removing storage/spider/Makefile.am. It was done by nayuta in a higher version as ef930dcad58, and it seems to me this file is indeed obsolete as CMake is an alternative to Autotools which uses Makefile.am. The reason the deletion of this file is in this issue is because the file references deleted spider handlersocket support (e.g. hs_client files)

          ycp Yuchen Pei added a comment - Hi holyfoot , ptal thanks: 0551b09871b upstream/bb-10.5-spider-fixup [fixup] Remove some obsolete cmake code related to the removed spider handlersocket support The reason that I opened an issue and requested review to this otherwise trivial patch is that I am not 100% sure about removing storage/spider/Makefile.am . It was done by nayuta in a higher version as ef930dcad58 , and it seems to me this file is indeed obsolete as CMake is an alternative to Autotools which uses Makefile.am. The reason the deletion of this file is in this issue is because the file references deleted spider handlersocket support (e.g. hs_client files)

          ok to push.

          holyfoot Alexey Botchkov added a comment - ok to push.
          ycp Yuchen Pei added a comment -

          thanks for the review - pushed 69874ee95c337cad36224ecd4b37293ea87caed4 to 10.5

          ycp Yuchen Pei added a comment - thanks for the review - pushed 69874ee95c337cad36224ecd4b37293ea87caed4 to 10.5

          People

            ycp Yuchen Pei
            ycp Yuchen Pei
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Git Integration

                Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.