Revert "Deep build refactoring phase 2 (#3564)" (#3678)

This reverts commit 449029a827.

dbcon/mysql/CMakeLists.txt

@@ -64,7 +64,7 @@ if(COMMAND mysql_add_plugin)
         ${PLUGIN_EXEC_LIBS}
         ${PLUGIN_WRITE_LIBS}
         joblist_server
-        statistics_manager
+        ${NETSNMP_LIBRARIES}
         ${MARIADB_CLIENT_LIBS}
         ${S3API_DEPS}
         threadpool
@@ -90,10 +90,10 @@ else()
         ${S3API_DEPS}
         ${ENGINE_LDFLAGS}
         ${ENGINE_WRITE_LIBS}
+        ${NETSNMP_LIBRARIES}
         ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a
         threadpool
         loggingcpp
-        statistics_manager
         marias3
     )
     # define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)

dbcon/mysql/ha_mcs_impl.cpp

@@ -127,9 +127,9 @@ using namespace funcexp;
 #include "ha_mcs_sysvars.h"
 
 #include "ha_mcs_datatype.h"
+#include "statistics.h"
 #include "ha_mcs_logging.h"
 #include "ha_subquery.h"
-#include "statistics_manager/statistics.h"
 
 using namespace std;
 

dbcon/mysql/idb_mysql.h

@@ -14,17 +14,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
-
-/* One include file to deal with all the MySQL pollution of the
-   global namespace
-
-   Don't include ANY mysql headers anywhere except here!
-
-   WARN: if any cmake build target uses this include file,
-   GenError from server must be added to the target dependencies
-   to generate mysqld_error.h used below
-*/
-
+// One include file to deal with all the MySQL pollution of the
+//  global namespace
+//
+// Don't include ANY mysql headers anywhere except here!
 #pragma once
 
 #ifdef TEST_MCSCONFIG_H