Bug#27001934 - DEMERGE CODE SNIPPETS FROM SQL_TABLE, WHICH ARE NEEDED BY MEB

Server code, needed by MEB was cut out of server files
by #ifndef UNIV_HOTBACKUP.

This patch reduces the amount of InnoDB code, compiled with
MEB, so that the functions, which need server code, are not
included. The changes in server code are reverted.

Unrelated changes:

Fix Windows build: Define strcasecmp and strncasecmp as
inline functions instead of preprocessor macros.

Change-Id: Iaabf9800f9e5c72282c312f76ad8da2765663c3f

Author: Ingo Struewing

sql/sql_table.cc

@@ -28,21 +28,16 @@
 #include <memory>
 #include <string>
 
-#ifndef UNIV_HOTBACKUP
 #include "binary_log_types.h"
 #include "binlog_event.h"
 #include "lex_string.h"
-#endif /* !UNIV_HOTBACKUP */
 #include "m_ctype.h"
 #include "m_string.h"                 // my_stpncpy
-#ifndef UNIV_HOTBACKUP
 #include "my_alloc.h"
 #include "my_base.h"
 #include "my_check_opt.h"             // T_EXTEND
 #include "my_compiler.h"
-#endif /* !UNIV_HOTBACKUP */
 #include "my_dbug.h"
-#ifndef UNIV_HOTBACKUP
 #include "my_io.h"
 #include "my_loglevel.h"
 #include "my_psi_config.h"
@@ -130,14 +125,10 @@
 #include "sql/sql_tablespace.h"       // validate_tablespace_name
 #include "sql/sql_time.h"             // make_truncated_value_warning
 #include "sql/sql_trigger.h"          // change_trigger_table_name
-#endif /* !UNIV_HOTBACKUP */
 #include "sql/strfunc.h"                  // find_type2
-#ifndef UNIV_HOTBACKUP
 #include "sql/strfunc.h"              // find_type2
 #include "sql/system_variables.h"
-#endif /* !UNIV_HOTBACKUP */
 #include "sql/table.h"
-#ifndef UNIV_HOTBACKUP
 #include "sql/thr_malloc.h"
 #include "sql/transaction.h"          // trans_commit_stmt
 #include "sql/transaction_info.h"
@@ -182,13 +173,6 @@ static bool prepare_enum_field(THD *thd, Create_field *sql_field);
 static uint blob_length_by_type(enum_field_types type);
 static const Create_field *get_field_by_index(Alter_info *alter_info, uint idx);
 
-#else /* !UNIV_HOTBACKUP */
-/* Branches which use these, should not be taken by backup. */
-#define ER_THD_OR_DEFAULT(thd,X) ("Cannot explain file name, MySQL error")
-#define get_quote_char_for_identifier(thd, conv_name, len) ('`')
-#endif /* !UNIV_HOTBACKUP */
-
-#ifndef UNIV_HOTBACKUP
 /**
   RAII class to control the atomic DDL commit on slave.
   A slave context flag responsible to mark the DDL as committed is
@@ -243,7 +227,6 @@ static bool trans_intermediate_ddl_commit(THD *thd, bool error)
   }
   return trans_commit_stmt(thd) || trans_commit(thd);
 }
-#endif /* !UNIV_HOTBACKUP */
 
 
 /**
@@ -518,7 +501,6 @@ size_t explain_filename(THD* thd,
   DBUG_RETURN(static_cast<size_t>(to_p - to));
 }
 
-#ifndef UNIV_HOTBACKUP
 void parse_filename(const char *filename, size_t filename_length,
                     const char ** schema_name, size_t *schema_name_length,
                     const char ** table_name, size_t *table_name_length,
@@ -633,7 +615,7 @@ void parse_filename(const char *filename, size_t filename_length,
   *subpartition_name= id_ptr;
   *subpartition_name_length= id_length;
 }
-#endif /* !UNIV_HOTBACKUP */
+
 
 /*
   Translate a file name to a table name (WL #1324).
@@ -668,15 +650,13 @@ size_t filename_to_tablename(const char *from, char *to, size_t to_length,
                     system_charset_info,  to, to_length, &errors);
     if (errors) // Old 5.0 name
     {
-#ifndef UNIV_HOTBACKUP
       if (!stay_quiet) {
         LogErr(ERROR_LEVEL, ER_INVALID_OR_OLD_TABLE_OR_DB_NAME, from);
       }
       /*
         TODO: add a stored procedure for fix table and database names,
         and mention its name in error log.
       */
-#endif /* !UNIV_HOTBACKUP */
     }
   }
 
@@ -685,7 +665,6 @@ size_t filename_to_tablename(const char *from, char *to, size_t to_length,
 }
 
 
-#ifndef UNIV_HOTBACKUP
 /*
   Translate a table name to a file name (WL #1324).
 
@@ -15015,4 +14994,3 @@ static bool check_engine(THD *thd, const char *db_name,
 
   DBUG_RETURN(false);
 }
-#endif /* !UNIV_HOTBACKUP */

sql/sql_table.h

@@ -23,7 +23,6 @@
 #include <utility>
 #include <vector>
 
-#ifndef UNIV_HOTBACKUP
 #include "binary_log_types.h"  // enum_field_types
 #include "dd/string_type.h"
 #include "m_ctype.h"
@@ -58,17 +57,13 @@ typedef struct st_mysql_mutex mysql_mutex_t;
 template<typename T> class List;
 
 
-#else /* !UNIV_HOTBACKUP */
-class THD {};
-#endif /* !UNIV_HOTBACKUP */
 enum enum_explain_filename_mode
 {
   EXPLAIN_ALL_VERBOSE= 0,
   EXPLAIN_PARTITIONS_VERBOSE,
   EXPLAIN_PARTITIONS_AS_COMMENT
 };
 
-#ifndef UNIV_HOTBACKUP
 /* Maximum length of GEOM_POINT Field */
 #define MAX_LEN_GEOM_POINT_FIELD   25
 
@@ -83,12 +78,10 @@ static const uint NO_FK_CHECKS=    1 << 2;
   the table.
 */
 static const uint NO_DD_COMMIT=    1 << 3;
-#endif /* !UNIV_HOTBACKUP */
 
 
 size_t filename_to_tablename(const char *from, char *to, size_t to_length,
                              bool stay_quiet = false);
-#ifndef UNIV_HOTBACKUP
 size_t tablename_to_filename(const char *from, char *to, size_t to_length);
 size_t build_table_filename(char *buff, size_t bufflen, const char *db,
                             const char *table, const char *ext,
@@ -489,13 +482,11 @@ bool mysql_prepare_create_table(THD *thd,
                                 uint existing_fks_count,
                                 int select_field_count,
                                 bool find_parent_keys);
-#endif /* !UNIV_HOTBACKUP */
 
 
 size_t explain_filename(THD* thd, const char *from, char *to, size_t to_length,
                         enum_explain_filename_mode explain_mode);
 
-#ifndef UNIV_HOTBACKUP
 void parse_filename(const char *filename, size_t filename_length,
                     const char ** schema_name, size_t *schema_name_length,
                     const char ** table_name, size_t *table_name_length,
@@ -518,5 +509,4 @@ extern MYSQL_PLUGIN_IMPORT const char *primary_key_name;
 
 bool lock_trigger_names(THD *thd, TABLE_LIST *tables);
 
-#endif /* !UNIV_HOTBACKUP */
 #endif /* SQL_TABLE_INCLUDED */

sql/strfunc.cc

@@ -19,17 +19,14 @@
 
 #include "m_ctype.h"                            // my_charset_latin1
 #include "my_dbug.h"
-#ifndef UNIV_HOTBACKUP
 #include "mysql/udf_registration_types.h"
 #include "sql/session_tracker.h"
 #include "sql/sql_class.h"
 #include "sql/sql_const.h"
 #include "sql/table.h"
-#endif /* !UNIV_HOTBACKUP */
 #include "sql_string.h"
 #include "typelib.h"                            // TYPELIB
 
-#ifndef UNIV_HOTBACKUP
 /*
   Return bitmap for strings used in a set
 
@@ -215,7 +212,6 @@ uint check_word(TYPELIB *lib, const char *val, const char *end,
     *end_of_word= ptr;
   return res;
 }
-#endif /* !UNIV_HOTBACKUP */
 
 
 /*
@@ -293,7 +289,6 @@ size_t strconvert(const CHARSET_INFO *from_cs, const char *from,
 }
 
 
-#ifndef UNIV_HOTBACKUP
 char *set_to_string(THD *thd, LEX_STRING *result, ulonglong set,
                     const char *lib[])
 {
@@ -348,5 +343,3 @@ char *flagset_to_string(THD *thd, LEX_STRING *result, ulonglong set,
 
   return result->str;
 }
-#endif /* !UNIV_HOTBACKUP */
-

sql/table.h

@@ -21,7 +21,6 @@
 #include <string>
 #include <vector>
 
-#ifndef UNIV_HOTBACKUP
 #include "binary_log_types.h"
 #include "lex_string.h"
 #include "m_ctype.h"
@@ -65,17 +64,11 @@
 #include "thr_lock.h"
 #include "typelib.h"
 
-#else /* !UNIV_HOTBACKUP */
-#ifdef MYSQL_CLIENT
-#undef MYSQL_CLIENT
-#endif /* MYSQL_CLIENT */
-#endif /* !UNIV_HOTBACKUP */
 
 #include "sql/mem_root_array.h"
 
 class Field;
 
-#ifndef UNIV_HOTBACKUP
 namespace histograms
 {
   class Histogram;
@@ -144,15 +137,13 @@ enum class enum_json_diff_operation;
   structures representing outer joins that have not been simplified away).
 */
 typedef ulonglong nested_join_map;
-#endif /* !UNIV_HOTBACKUP */
 
 
 #define tmp_file_prefix "#sql"			/**< Prefix for tmp tables */
 #define tmp_file_prefix_length 4
 #define TMP_TABLE_KEY_EXTRA 8
 #define PLACEHOLDER_TABLE_ROW_ESTIMATE 2
 
-#ifndef UNIV_HOTBACKUP
 /**
   Enumerate possible types of a table from re-execution
   standpoint.
@@ -1177,8 +1168,6 @@ class Blob_mem_storage: public Sql_alloc
 };
 
 
-#endif /* UNIV_HOTBACKUP */
-
 /**
   Class that represents a single change to a column value in partial
   update of a JSON column.
@@ -1226,8 +1215,6 @@ class Binary_diff final
 */
 using Binary_diff_vector= Mem_root_array<Binary_diff>;
 
-#ifndef UNIV_HOTBACKUP
-
 /**
   Flags for TABLE::m_status (maximum 8 bits).
   The flags define the state of the row buffer in TABLE::record[0].
@@ -3845,10 +3832,8 @@ extern LEX_STRING MYSQL_TABLESPACE_NAME;
 extern LEX_STRING RLI_INFO_NAME;
 extern LEX_STRING MI_INFO_NAME;
 extern LEX_STRING WORKER_INFO_NAME;
-#endif /* !UNIV_HOTBACKUP */
 extern "C" MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info;
 
-#ifndef UNIV_HOTBACKUP
 inline bool is_infoschema_db(const char *name, size_t len)
 {
   return (INFORMATION_SCHEMA_NAME.length == len &&
@@ -4064,5 +4049,4 @@ bool create_table_share_for_upgrade(THD *thd,
                                     bool is_fix_view_cols_and_deps);
 //////////////////////////////////////////////////////////////////////////
 
-#endif /* !UNIV_HOTBACKUP */
 #endif /* TABLE_INCLUDED */

storage/innobase/dict/dict0dd.cc

@@ -553,16 +553,16 @@ dd_check_corrupted(dict_table_t*& table)
 			char	db_buf[MAX_DATABASE_NAME_LEN + 1];
 			char	tbl_buf[MAX_TABLE_NAME_LEN + 1];
 
+#ifndef UNIV_HOTBACKUP
 			dd_parse_tbl_name(
 				table->name.m_name, db_buf, tbl_buf,
 				nullptr, nullptr, nullptr);
-#ifndef UNIV_HOTBACKUP
 			my_error(ER_TABLE_CORRUPT, MYF(0),
 				 db_buf, tbl_buf);
 #else /* !UNIV_HOTBACKUP */
 			ib::fatal()
 				<< "table is corrupt: "
-				<< db_buf << "." << tbl_buf;
+				<< table->name.m_name;
 #endif /* !UNIV_HOTBACKUP */
 		}
 		table = nullptr;
@@ -681,9 +681,11 @@ dd_table_open_on_id(
 		}
 	} else {
 		for (;;) {
+#ifndef UNIV_HOTBACKUP
 			bool ret = dd_parse_tbl_name(
 				ib_table->name.m_name, db_buf, tbl_buf,
 				nullptr, nullptr, nullptr);
+#endif /* !UNIV_HOTBACKUP */
 
 			memset(full_name, 0, MAX_FULL_NAME_LEN + 1);
 
@@ -693,14 +695,14 @@ dd_table_open_on_id(
 
 			mutex_exit(&dict_sys->mutex);
 
+#ifndef UNIV_HOTBACKUP
 			if (ret == false) {
 				if (dict_locked) {
 					mutex_enter(&dict_sys->mutex);
 				}
 				return(nullptr);
 			}
 
-#ifndef UNIV_HOTBACKUP
 			if (dd_mdl_acquire(thd, mdl, db_buf, tbl_buf)) {
 				if (dict_locked) {
 					mutex_enter(&dict_sys->mutex);
@@ -2666,7 +2668,6 @@ dd_fill_dict_table(
 
 	return(m_table);
 }
-#endif /* !UNIV_HOTBACKUP */
 
 /** Parse the tablespace name from filename charset to table name charset
 @param[in]      space_name      tablespace name
@@ -2718,7 +2719,6 @@ dd_filename_to_spacename(
 	ut_ad(tablespace_name->size() < MAX_SPACE_NAME_LEN);
 }
 
-#ifndef UNIV_HOTBACKUP
 /* Create metadata for specified tablespace, acquiring exlcusive MDL first
 @param[in,out]	dd_client	data dictionary client
 @param[in,out]	thd		THD

storage/innobase/dict/dict0mem.cc

@@ -81,7 +81,11 @@ operator<<(
 	std::ostream&		s,
 	const table_name_t&	table_name)
 {
+#ifndef UNIV_HOTBACKUP
 	return(s << ut_get_name(NULL, table_name.m_name));
+#else /* !UNIV_HOTBACKUP */
+	return(s << table_name.m_name);
+#endif /* !UNIV_HOTBACKUP */
 }
 
 #ifndef UNIV_HOTBACKUP

storage/innobase/handler/ha_innodb.cc

@@ -3196,7 +3196,6 @@ innobase_quote_identifier(
 		putc(q, file);
 	}
 }
-#endif /* !UNIV_HOTBACKUP */
 
 /** Convert a table name to the MySQL system_charset_info (UTF-8)
 and quote it.
@@ -3272,7 +3271,6 @@ innobase_convert_name(
 	return(s);
 }
 
-#ifndef UNIV_HOTBACKUP
 /*****************************************************************//**
 A wrapper function of innobase_convert_name(), convert a table name
 to the MySQL system_charset_info (UTF-8) and quote it if needed.

storage/innobase/include/dict0dd.h

@@ -920,7 +920,6 @@ MY_ATTRIBUTE((warn_unused_result))
 innodb_session_t*&
 thd_to_innodb_session(
 	THD*	thd);
-#endif /* !UNIV_HOTBACKUP */
 
 /** Parse a table file name into table name and database name.
 Note the table name may have trailing TMP_POSTFIX for temporary table name.
@@ -943,7 +942,6 @@ dd_parse_tbl_name(
 	char*		dd_sub_name,
 	bool*		is_temp);
 
-#ifndef UNIV_HOTBACKUP
 /** Look up a column in a table using the system_charset_info collation.
 @param[in]	dd_table	data dictionary table
 @param[in]	name		column name