Bug#34772777: mysql/plugin.h included in test_page_track_component

Problem: Headers mysql/plugin.h and my_io.h shall not be included
by any component.

Fix:
1) Added checks if the headers are compiled with component.
2) Remove unnecessary inclusions of the headers.
3) Copy missing declarations to components/bits/*.h and include them.

Change-Id: I4e20e7e8725bed330cb4ac2856ae03098a261c79

Author: Michal Jankowski

components/audit_api_message_emit/audit_api_message_emit.cc

@@ -38,10 +38,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include <mysql/components/my_service.h>
 #include <mysql/components/service_implementation.h>
 #include <mysql/components/services/audit_api_message_service.h>
+#include <mysql/components/services/bits/my_err_bits.h>
 #include <mysql/components/services/udf_metadata.h>
 #include <mysql/components/services/udf_registration.h>
 #include <mysql/service_plugin_registry.h>
-#include <mysql_com.h>
 
 #include <stdio.h>
 #include <stdlib.h>

components/logging/log_filter_dragnet.cc

@@ -73,6 +73,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
   "EXISTS source_line THEN unset source_line."
 
 #include <mysqld_error.h>
+#include <cctype>
 #include "../sql/sql_error.h"
 
 #include <mysql/components/component_implementation.h>
@@ -82,8 +83,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include <mysql/components/services/component_sys_var_service.h>
 #include <mysql/components/services/mysql_system_variable.h>
 
-#include "../sql/set_var.h"
-
 REQUIRES_SERVICE_PLACEHOLDER(component_sys_variable_register);
 REQUIRES_SERVICE_PLACEHOLDER(component_sys_variable_unregister);
 REQUIRES_SERVICE_PLACEHOLDER(mysql_system_variable_reader);

components/logging/log_sink_syseventlog.cc

@@ -21,23 +21,20 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <mysql/components/services/log_builtins.h>
-
 #include "log_service_imp.h"
 #include "m_string.h"  // native_strncasecmp()/native_strcasecmp()
 #include "my_compiler.h"
-#include "my_io.h"
-#include "my_sys.h"
 #include "mysqld_error.h"  // so we can throw ER_LOG_SYSLOG_*
 
 #include <mysql/components/component_implementation.h>
 #include <mysql/components/service_implementation.h>
+#include <mysql/components/services/log_builtins.h>
 
+#include <mysql/components/services/bits/my_io_bits.h>
+#include <mysql/components/services/bits/my_syslog_bits.h>
 #include <mysql/components/services/component_sys_var_service.h>
 #include <mysql/components/services/mysql_system_variable.h>
 
-#include "../sql/set_var.h"
-
 #ifndef _WIN32
 #include <syslog.h>  // LOG_DAEMON etc. -- facility names
 
@@ -91,6 +88,12 @@ static SYSLOG_FACILITY syslog_facility[] = {
 #endif
 #define OPT_TAG "tag"
 
+#ifdef _WIN32
+#define OS_PATH_SEPARATOR '\\'
+#else
+#define OS_PATH_SEPARATOR '/'
+#endif /* _WIN32 */
+
 static bool inited = false; /**< component initialized */
 
 // components we'll be using
@@ -295,7 +298,8 @@ static int var_update_tag(const char *tag) {
   bool ident_changed = false;
 
   // tag must not contain directory separators
-  if ((tag != nullptr) && (strchr(tag, FN_LIBCHAR) != nullptr)) return -1;
+  if ((tag != nullptr) && (strchr(tag, OS_PATH_SEPARATOR) != nullptr))
+    return -1;
 
   /*
     make ident

components/mysqlbackup/backup_page_tracker.cc

@@ -34,9 +34,15 @@
 #include <sys/stat.h>
 
 #include "backup_comp_constants.h"
-#include "mysql/plugin.h"
+#include "mysql/components/services/bits/my_err_bits.h"
 #include "mysqld_error.h"
 
+#ifdef _WIN32
+#define OS_PATH_SEPARATOR '\\'
+#else
+#define OS_PATH_SEPARATOR '/'
+#endif /* _WIN32 */
+
 // defined in mysqlbackup component definition
 extern char *mysqlbackup_backup_id;
 
@@ -405,7 +411,7 @@ long long Backup_page_tracker::page_track_get_changed_pages(UDF_INIT *,
 
   free(m_changed_pages_file);
   m_changed_pages_file =
-      strdup((changed_pages_file_dir + FN_LIBCHAR + backupid +
+      strdup((changed_pages_file_dir + OS_PATH_SEPARATOR + backupid +
               Backup_comp_constants::change_file_extension)
                  .c_str());
 

components/mysqlbackup/mysqlbackup.cc

@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include "mysql/components/library_mysys/my_memory.h"
 #include "mysql/components/services/psi_memory.h"
 #include "mysql/service_security_context.h"
+#include "mysql_version.h"
 #include "mysqld_error.h"
 #include "string_with_len.h"
 

components/test/statement_services/test_execute_regular_statement.cc

@@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include "mysql/components/services/defs/mysql_string_defs.h"
 
 #include "field_types.h"
-#include "mysql_com.h"
 #include "scope_guard.h"
 
 #include "utils.h"

components/test/test_mysql_command_services.cc

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include <mysql/components/services/udf_registration.h>
 #include <mysql/service_srv_session_info.h>
 #include <stdio.h>
-#include <string>
+#include <cstring>
 
 REQUIRES_SERVICE_PLACEHOLDER_AS(mysql_thd_security_context, thd_security_ctx);
 REQUIRES_SERVICE_PLACEHOLDER_AS(mysql_account_database_security_context_lookup,

components/test/test_sensitive_system_variables.cc

@@ -23,10 +23,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include <mysql/components/component_implementation.h>
 #include <mysql/components/service_implementation.h>
+#include <mysql/components/services/bits/system_variables_bits.h>
 #include <mysql/components/services/component_sys_var_service.h>
-#include <mysql/plugin.h>
 
-#include "my_macros.h"
 #include "scope_guard.h"
 #include "typelib.h"
 

components/test/test_session_var_service.cc

@@ -22,14 +22,17 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include <fcntl.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
 #include <mysql/components/component_implementation.h>
 #include <mysql/components/service_implementation.h>
+#include <mysql/components/services/bits/system_variables_bits.h>
 #include <mysql/components/services/component_sys_var_service.h>
 #include <mysql/components/services/mysql_current_thread_reader.h>
 #include <mysql/components/services/mysql_system_variable.h>
-#include <mysql/plugin.h>
 
-#include "my_macros.h"
 #include "nulls.h"
 #include "template_utils.h"
 #include "typelib.h"

components/test/test_sys_var_service.cc

@@ -22,13 +22,16 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include <fcntl.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
 #include <mysql/components/component_implementation.h>
 #include <mysql/components/service_implementation.h>
+#include <mysql/components/services/bits/system_variables_bits.h>
 #include <mysql/components/services/component_sys_var_service.h>
 #include <mysql/components/services/mysql_system_variable.h>
-#include <mysql/plugin.h>
 
-#include "my_macros.h"
 #include "nulls.h"
 #include "template_utils.h"
 #include "typelib.h"