Move packet_tracker.cc under maxscale

It depends on MaxScale-types. This also removes the maxsql-pcre2-dependency.

maxutils/maxsql/include/maxsql/CMakeLists.txt

@@ -1,4 +1,2 @@
 install_header(mariadb.hh devel)
 install_header(ccdefs.hh devel)
-install_header(packet_tracker.hh devel)
-install_header(mysql_plus.hh devel)

maxutils/maxsql/src/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_library(maxsql STATIC
   mariadb.cc
-  packet_tracker.cc
   queryresult.cc
   )
 

server/core/CMakeLists.txt

@@ -29,6 +29,7 @@ add_library(maxscale-common SHARED
   monitormanager.cc
   mysql_binlog.cc
   mysql_utils.cc
+  packet_tracker.cc
   paths.cc
   poll.cc
   queryclassifier.cc

server/core/packet_tracker.cc

@@ -13,8 +13,8 @@
 
 // LIMITATION: local infile not handled yet.
 
-#include <maxsql/packet_tracker.hh>
-#include <maxsql/mysql_plus.hh>
+#include <maxscale/packet_tracker.hh>
+#include <maxscale/mysql_plus.hh>
 #include <maxscale/modutil.hh>
 
 #include <array>

server/modules/routing/smartrouter/smartsession.cc

@@ -15,7 +15,7 @@
 #include "performance.hh"
 
 #include <maxscale/modutil.hh>
-#include <maxsql/mysql_plus.hh>
+#include <maxscale/mysql_plus.hh>
 
 // COPY-PASTED error-extraction functions from rwsplit. TODO move to lib.
 inline void extract_error_state(uint8_t* pBuffer, uint8_t** ppState, uint16_t* pnState)

server/modules/routing/smartrouter/smartsession.hh

@@ -14,11 +14,10 @@
 
 #include "smartrouter.hh"
 
-#include <maxsql/packet_tracker.hh>
-#include <maxscale/queryclassifier.hh>
-#include <maxbase/host.hh>
-
 #include <iostream>
+#include <maxbase/host.hh>
+#include <maxscale/packet_tracker.hh>
+#include <maxscale/queryclassifier.hh>
 
 class SmartRouter;