mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
This commit is contained in:
@@ -53,12 +53,15 @@ plugin_type_init plugin_type_deinitialize[MYSQL_MAX_PLUGIN_TYPE_NUM]=
|
||||
0,ha_finalize_handlerton,0,0,finalize_schema_table
|
||||
};
|
||||
|
||||
#ifdef HAVE_DLOPEN
|
||||
static const char *plugin_interface_version_sym=
|
||||
"_mysql_plugin_interface_version_";
|
||||
static const char *sizeof_st_plugin_sym=
|
||||
"_mysql_sizeof_struct_st_plugin_";
|
||||
static const char *plugin_declarations_sym= "_mysql_plugin_declarations_";
|
||||
static int min_plugin_interface_version= MYSQL_PLUGIN_INTERFACE_VERSION & ~0xFF;
|
||||
#endif
|
||||
|
||||
/* Note that 'int version' must be the first field of every plugin
|
||||
sub-structure (plugin->info).
|
||||
*/
|
||||
@@ -91,6 +94,8 @@ static int plugin_array_version=0;
|
||||
my_bool plugin_register_builtin(struct st_mysql_plugin *plugin);
|
||||
void plugin_load(void);
|
||||
|
||||
#ifdef HAVE_DLOPEN
|
||||
|
||||
static struct st_plugin_dl *plugin_dl_find(const LEX_STRING *dl)
|
||||
{
|
||||
uint i;
|
||||
@@ -128,6 +133,8 @@ static st_plugin_dl *plugin_dl_insert_or_reuse(struct st_plugin_dl *plugin_dl)
|
||||
DBUG_RETURN(dynamic_element(&plugin_dl_array, plugin_dl_array.elements - 1,
|
||||
struct st_plugin_dl *));
|
||||
}
|
||||
#endif /* HAVE_DLOPEN */
|
||||
|
||||
|
||||
static inline void free_plugin_mem(struct st_plugin_dl *p)
|
||||
{
|
||||
@@ -545,6 +552,8 @@ static void plugin_del(struct st_plugin_int *plugin)
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
#ifdef NOT_USED
|
||||
|
||||
static void plugin_del(const LEX_STRING *name)
|
||||
{
|
||||
struct st_plugin_int *plugin;
|
||||
@@ -554,6 +563,8 @@ static void plugin_del(const LEX_STRING *name)
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void plugin_unlock(struct st_plugin_int *plugin)
|
||||
{
|
||||
DBUG_ENTER("plugin_unlock");
|
||||
|
Reference in New Issue
Block a user