WL#15563: RPL Libraries

RPL Libraries code structure

Change-Id: I6bd4ea42603e27d9344202c08561399b52e37c79

Author: Karolina Szczepankiewicz

CMakeLists.txt

@@ -867,6 +867,7 @@ INCLUDE(fprofile)
 INCLUDE(gloves)
 INCLUDE(fido2)
 INCLUDE(win_jemalloc)
+INCLUDE(libs_mysql_create_library)
 
 IF(UNIX)
   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
@@ -1639,6 +1640,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/include
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_SOURCE_DIR}/libs
   )
 
 IF(WITH_LTO)
@@ -2219,8 +2221,8 @@ ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(libmysql)
-ADD_SUBDIRECTORY(libbinlogevents)
-ADD_SUBDIRECTORY(libbinlogstandalone)
+# Directory for MySQL Database libraries (Client/Server)
+ADD_SUBDIRECTORY(libs/mysql)
 ADD_SUBDIRECTORY(libchangestreams)
 ADD_SUBDIRECTORY(sql-common/oci)
 

Doxyfile-ignored

@@ -63,9 +63,9 @@
 sql/rpl_rli_pdb.h:[0-9]+: warning:
 sql/rpl_trx_tracking.h:[0-9]+: warning:
 sql/rpl_utility.h:[0-9]+: warning:
-libbinlogevents/include/binlog_event.h:[0-9]+: warning:
-libbinlogevents/include/codecs/binary.h:[0-9]+: warning:
-libbinlogevents/include/trx_boundary_parser.h:[0-9]+: warning:
+mysql/binlog/event/binlog_event.h:[0-9]+: warning:
+mysql/binlog/event/codecs/binary.h:[0-9]+: warning:
+mysql/binlog/event/trx_boundary_parser.h:[0-9]+: warning:
 plugin/group_replication/src/applier.cc:[0-9]+: warning:
 sql/log_event.h:[0-9]+: warning:
 sql/rpl_replica.cc:[0-9]+: warning:
@@ -106,6 +106,8 @@ sql/rpl_info_dummy.cc:.*no uniquely matching class member found for
 sql/rpl_info_table.cc:.*no uniquely matching class member found for
 sql/rwlock_scoped_lock.cc:.*no uniquely matching class member found for
 sql/sql_prepare.cc:.*no uniquely matching class member found for
+sql/log_event.cc:.*no uniquely matching class member found for
+sql/log_event.cc:.*no matching class member found for
 #===========================================================================
 
 #===========================================================================

Doxyfile.in

@@ -931,8 +931,7 @@ WARN_LOGFILE           =
 INPUT                  = ./client \
                          ./components \
                          ./include \
-                         ./libbinlogevents \
-                         ./libbinlogstandalone \
+                         ./libs/mysql \
                          ./libservices \
                          ./mysql-test/mysql-test-run.dox \
                          ./mysys \

client/CMakeLists.txt

@@ -238,11 +238,10 @@ SET(MYSQLBINLOG_SOURCES
   ${CMAKE_SOURCE_DIR}/sql/binlog_reader.cc
   ${CMAKE_SOURCE_DIR}/sql/stream_cipher.cc
   ${CMAKE_SOURCE_DIR}/sql/rpl_log_encryption.cc
-  ${CMAKE_SOURCE_DIR}/libbinlogevents/src/trx_boundary_parser.cpp
   )
 
 SET(MYSQLBINLOG_LIBRARIES
-  binlogevents_static
+  mysql_binlog_event
   client_base
   mysqlclient
   )