InnoDB: Exclude code from InnoDB Hot Backup builds

by adding #ifndef UNIV_HOTBACKUP and adjusting some function
declarations.


innobase/data/data0type.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/dict/dict0dict.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/dict/dict0load.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/data0type.ic:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/srv0srv.h:
  Introduce srv_init(), so that it can be called in InnoDB Hot Backup
innobase/include/srv0start.h:
  Introduce srv_add_path_separator_if_needed(), so that it can be
  invoked in InnoDB Hot Backup
innobase/include/sync0sync.h:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/sync0sync.ic:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/trx0trx.h:
  trx_recover_for_mysql(): replace uint with ulint, as uint is not
  declared in InnoDB Hot Backup
innobase/lock/lock0lock.c:
  Replace bool with ibool
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/row/row0ins.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/row/row0mysql.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/srv/srv0srv.c:
  Make srv_init() global, so that InnoDB Hot Backup can call it.
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/srv/srv0start.c:
  Make srv_add_path_separator_if_needed() global for InnoDB Hot Backup.
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/sync/sync0rw.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/sync/sync0sync.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/trx/trx0roll.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/trx/trx0trx.c:
  Replace uint with ulint, as uint is undeclared in InnoDB Hot Backup
innobase/ut/ut0ut.c:
  Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP

2 files changed, 27 insertions, 0 deletions

diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index 800d7dcd9e9..6ec4809790e 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -53,6 +53,7 @@ rw_lock_t	dict_operation_lock;	/* table create, drop, etc. reserve
 /* Identifies generated InnoDB foreign key names */
 static char	dict_ibfk[] = "_ibfk_";
 
+#ifndef UNIV_HOTBACKUP
 /**********************************************************************
 Compares NUL-terminated UTF-8 strings case insensitively.
 
@@ -76,6 +77,7 @@ void
 innobase_casedn_str(
 /*================*/
 	char*	a);	/* in/out: string to put in lower case */
+#endif /* !UNIV_HOTBACKUP */
 
 /**************************************************************************
 Adds a column to the data dictionary hash table. */
@@ -2095,6 +2097,7 @@ dict_foreign_find_index(
 	dict_index_t*	types_idx)/* in: NULL or an index to whose types the
 				column types must match */
 {
+#ifndef UNIV_HOTBACKUP
 	dict_index_t*	index;
 	const char*	col_name;
 	ulint		i;
@@ -2139,6 +2142,12 @@ dict_foreign_find_index(
 	}
 
 	return(NULL);
+#else /* UNIV_HOTBACKUP */
+	/* This function depends on MySQL code that is not included in
+	InnoDB Hot Backup builds.  Besides, this function should never
+	be called in InnoDB Hot Backup. */
+	ut_error;
+#endif /* UNIV_HOTBACKUP */
 }
 
 /**************************************************************************
@@ -2492,6 +2501,7 @@ dict_scan_col(
 	const char**	name)	/* out,own: the column name; NULL if no name
 				was scannable */
 {
+#ifndef UNIV_HOTBACKUP
 	dict_col_t*	col;
 	ulint		i;
 
@@ -2525,6 +2535,12 @@ dict_scan_col(
 	}
 	
 	return(ptr);
+#else /* UNIV_HOTBACKUP */
+	/* This function depends on MySQL code that is not included in
+	InnoDB Hot Backup builds.  Besides, this function should never
+	be called in InnoDB Hot Backup. */
+	ut_error;
+#endif /* UNIV_HOTBACKUP */
 }
 
 /*************************************************************************
@@ -2542,6 +2558,7 @@ dict_scan_table_name(
 	const char**	ref_name)/* out,own: the table name;
 				NULL if no name was scannable */
 {
+#ifndef UNIV_HOTBACKUP
 	const char*	database_name	= NULL;
 	ulint		database_name_len = 0;
 	const char*	table_name	= NULL;
@@ -2623,6 +2640,12 @@ dict_scan_table_name(
 	*table = dict_table_get_low(ref);
 
 	return(ptr);
+#else /* UNIV_HOTBACKUP */
+	/* This function depends on MySQL code that is not included in
+	InnoDB Hot Backup builds.  Besides, this function should never
+	be called in InnoDB Hot Backup. */
+	ut_error;
+#endif /* UNIV_HOTBACKUP */
 }
 
 /*************************************************************************
diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c
index 17b53a7a140..7fd1ca08c04 100644
--- a/innobase/dict/dict0load.c
+++ b/innobase/dict/dict0load.c
@@ -8,7 +8,9 @@ Created 4/24/1996 Heikki Tuuri
 *******************************************************/
 
 #include "dict0load.h"
+#ifndef UNIV_HOTBACKUP
 #include "mysql_version.h"
+#endif /* !UNIV_HOTBACKUP */
 
 #ifdef UNIV_NONINL
 #include "dict0load.ic"
@@ -792,6 +794,7 @@ dict_load_table(
 			name, (ulong)mix_len);
 	}
 
+#ifndef UNIV_HOTBACKUP
 #if MYSQL_VERSION_ID < 50003
 	/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the
 	"compact format" flag. */
@@ -807,6 +810,7 @@ dict_load_table(
 		return(NULL);
 	}
 #endif /* MYSQL_VERSION_ID < 50300 */
+#endif /* !UNIV_HOTBACKUP */
 
 	ut_a(0 == ut_strcmp("SPACE",
 		dict_field_get_col(