Commit 753a5a1d authored by marko's avatar marko

branches/zip: Hide some global variables that were accidentally not hidden

in r2276.  Now the following symbols will be exported when InnoDB is built
as a dynamic plugin:

* the virtual method pointer table of class ha_innodb
* the three variables that MySQL will reference when linking at runtime:

	_mysql_plugin_declarations_
	_mysql_plugin_interface_version_
	_mysql_sizeof_struct_st_plugin_

Furthermore, the following symbols are weak globals, to allow us to access
the built-in InnoDB in the mysqld executable, in case it contains a statically
linked InnoDB:

	builtin_innobase_plugin
	innodb_hton_ptr
parent 1417f52a
...@@ -38,7 +38,7 @@ this MySQL installation to this global variable. If we have < 4.1.2 format ...@@ -38,7 +38,7 @@ this MySQL installation to this global variable. If we have < 4.1.2 format
column definitions, or records in the insert buffer, we use this column definitions, or records in the insert buffer, we use this
charset-collation code for them. */ charset-collation code for them. */
ulint data_mysql_default_charset_coll = 99999999; UNIV_INTERN ulint data_mysql_default_charset_coll;
/************************************************************************* /*************************************************************************
Determine how many bytes the first n characters of the given string occupy. Determine how many bytes the first n characters of the given string occupy.
......
...@@ -373,7 +373,7 @@ static struct st_mysql_information_schema i_s_info = ...@@ -373,7 +373,7 @@ static struct st_mysql_information_schema i_s_info =
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION
}; };
struct st_mysql_plugin i_s_innodb_trx = UNIV_INTERN struct st_mysql_plugin i_s_innodb_trx =
{ {
/* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */ /* int */
...@@ -648,7 +648,7 @@ innodb_locks_init( ...@@ -648,7 +648,7 @@ innodb_locks_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
struct st_mysql_plugin i_s_innodb_locks = UNIV_INTERN struct st_mysql_plugin i_s_innodb_locks =
{ {
/* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */ /* int */
...@@ -831,7 +831,7 @@ innodb_lock_waits_init( ...@@ -831,7 +831,7 @@ innodb_lock_waits_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
struct st_mysql_plugin i_s_innodb_lock_waits = UNIV_INTERN struct st_mysql_plugin i_s_innodb_lock_waits =
{ {
/* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */ /* int */
...@@ -1171,7 +1171,7 @@ i_s_zip_reset_init( ...@@ -1171,7 +1171,7 @@ i_s_zip_reset_init(
DBUG_RETURN(0); DBUG_RETURN(0);
} }
struct st_mysql_plugin i_s_innodb_zip = UNIV_INTERN struct st_mysql_plugin i_s_innodb_zip =
{ {
/* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */ /* int */
...@@ -1220,7 +1220,7 @@ struct st_mysql_plugin i_s_innodb_zip = ...@@ -1220,7 +1220,7 @@ struct st_mysql_plugin i_s_innodb_zip =
STRUCT_FLD(__reserved1, NULL) STRUCT_FLD(__reserved1, NULL)
}; };
struct st_mysql_plugin i_s_innodb_zip_reset = UNIV_INTERN struct st_mysql_plugin i_s_innodb_zip_reset =
{ {
/* the plugin type (a MYSQL_XXX_PLUGIN value) */ /* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */ /* int */
......
...@@ -152,7 +152,7 @@ struct trx_i_s_cache_struct { ...@@ -152,7 +152,7 @@ struct trx_i_s_cache_struct {
INFORMATION SCHEMA tables is fetched and later retrieved by the C++ INFORMATION SCHEMA tables is fetched and later retrieved by the C++
code in handler/i_s.cc. */ code in handler/i_s.cc. */
static trx_i_s_cache_t trx_i_s_cache_static; static trx_i_s_cache_t trx_i_s_cache_static;
trx_i_s_cache_t* trx_i_s_cache = &trx_i_s_cache_static; UNIV_INTERN trx_i_s_cache_t* trx_i_s_cache = &trx_i_s_cache_static;
/*********************************************************************** /***********************************************************************
For a record lock that is in waiting state retrieves the only bit that For a record lock that is in waiting state retrieves the only bit that
......
...@@ -18,7 +18,7 @@ Created 5/11/1994 Heikki Tuuri ...@@ -18,7 +18,7 @@ Created 5/11/1994 Heikki Tuuri
#define UT_RANDOM_3 1.0132677 #define UT_RANDOM_3 1.0132677
ulint ut_rnd_ulint_counter = 65654363; UNIV_INTERN ulint ut_rnd_ulint_counter = 65654363;
/*************************************************************** /***************************************************************
Looks for a prime number slightly greater than the given argument. Looks for a prime number slightly greater than the given argument.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment