BUG 22842324 - X PLUGIN NOT LOADABLE WHEN SERVER BUILT WITH -DWITH_LIBEVENT=SYSTEM

The X plugin did not get linked with proper library in case of -DWITH_LIBEVENT=SYSTEM.
Other cmake variable gets set in that case, the fix adds that variable for pluging linking.

Reviewed-by: Tor Didriksen <[email protected]>
Reviewed-by: Lukasz Kotula <[email protected]>

RB: 11955
(cherry picked from commit 6cd04018e317f8b8b3889bcf6a7c294672b8d5f4)

Author: Andrzej Religa

rapid/plugin/x/CMakeLists.txt

@@ -120,7 +120,7 @@ ELSE()
     ${xplugin_SRC} ${xplugin_PROTOBUF_SRC}
     COMPILE_FLAGS "-I${xplugin_PROTOBUF_DIR}")
 
-  TARGET_LINK_LIBRARIES(xplugin ${LIBEVENT_LIBRARY})
+  TARGET_LINK_LIBRARIES(xplugin ${LIBEVENT_LIBRARY} ${LIBEVENT_LIBRARIES})
 
   # These are built *with* -DMYSQL_DYNAMIC_PLUGIN
   MYSQL_ADD_PLUGIN(mysqlx
@@ -131,7 +131,10 @@ ELSE()
 
   RESTRICT_SYMBOL_SOURCE("${MYSQLX_PROJECT_DIR}/ngs/src/mysql41_hash.cc")
 
-  ADD_DEPENDENCIES(xplugin GenError event)
+  ADD_DEPENDENCIES(xplugin GenError)
+  IF (WITH_LIBEVENT STREQUAL "bundled")
+    ADD_DEPENDENCIES(xplugin ${LIBEVENT_LIBRARY})
+  ENDIF()
 
   IF(XPLUGIN_LOG_PROTOBUF)
     MESSAGE(STATUS "MYSQLX - Text log of protobuf messages enabled")

rapid/plugin/x/src/statement_builder.h

@@ -66,7 +66,7 @@ class Statement_builder
     template<typename L, typename Op>
     const Builder &put_list(const L &list, Op generate) const
     {
-      if (list.empty())
+      if (list.size() == 0)
         return *this;
 
       typename L::const_iterator p = list.begin();

sql/CMakeLists.txt

@@ -461,10 +461,8 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
     FOREACH (CORELIB sql binlog slave mysys mysys_ssl dbug regex strings
         vio binlogevents_static)
       GET_TARGET_PROPERTY(LOC ${CORELIB} LOCATION)
-      MESSAGE(STATUS "${CORELIB} ${LOC}")
       IF (NOT LOC)
         GET_TARGET_PROPERTY(LOC ${CORELIB} IMPORTED_LOCATION)
-        MESSAGE(STATUS "${CORELIB} ${LOC}")
       ENDIF()