branches/zip: Hide unnecessarily visible globals.

dict_ind_redundant, dict_ind_compact: Declare these UNIV_INTERN.
innodb_hton_ptr: Declare static.  We do not attempt to access the
built-in InnoDB any more.
trx_roll_savepoints_free(): Declare UNIV_INTERN.

dict/dict0dict.c

@@ -29,9 +29,9 @@ Created 1/8/1996 Heikki Tuuri
 #endif
 
 /* dummy index for ROW_FORMAT=REDUNDANT supremum and infimum records */
-dict_index_t*	dict_ind_redundant;
+UNIV_INTERN dict_index_t*	dict_ind_redundant;
 /* dummy index for ROW_FORMAT=COMPACT supremum and infimum records */
-dict_index_t*	dict_ind_compact;
+UNIV_INTERN dict_index_t*	dict_ind_compact;
 
 #ifndef UNIV_HOTBACKUP
 #include "buf0buf.h"

handler/ha_innodb.cc

@@ -112,13 +112,7 @@ undefined.  Map it to NULL. */
 # define EQ_CURRENT_THD(thd) ((thd) == current_thd)
 #endif /* MYSQL_DYNAMIC_PLUGIN && __WIN__ */
 
-#ifdef MYSQL_DYNAMIC_PLUGIN
-/* These must be weak global variables in the dynamic plugin. */
-struct handlerton* innodb_hton_ptr;
-#else /* MYSQL_DYNAMIC_PLUGIN */
-/* This must be a global variable in the statically linked InnoDB. */
-struct handlerton* innodb_hton_ptr = NULL;
-#endif /* MYSQL_DYNAMIC_PLUGIN */
+static struct handlerton* innodb_hton_ptr;
 
 static const long AUTOINC_OLD_STYLE_LOCKING = 0;
 static const long AUTOINC_NEW_STYLE_LOCKING = 1;

include/trx0roll.h

@@ -278,7 +278,7 @@ trx_roll_savepoint_free(
 /***********************************************************************
 Frees savepoint structs starting from savep, if savep == NULL then
 free all savepoints. */
-
+UNIV_INTERN
 void
 trx_roll_savepoints_free(
 /*=====================*/

trx/trx0roll.c

@@ -198,7 +198,7 @@ trx_roll_savepoint_free(
 /***********************************************************************
 Frees savepoint structs starting from savep, if savep == NULL then
 free all savepoints. */
-
+UNIV_INTERN
 void
 trx_roll_savepoints_free(
 /*=====================*/