database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

WL#3201

Browse Source 
post-merge fixes
This commit is contained in:
acurtis@xiphis.org
2006-04-24 14:32:45 -07:00
parent 53d4594cfe
commit e2ac9dda83
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config/ac-macros/plugins.m4
View File

@ -238,6 +238,7 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ dnl
_MYSQL_CHECK_PLUGIN_ARGS([$1]) _MYSQL_CHECK_PLUGIN_ARGS([$1])
_MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) _MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
_MYSQL_DO_PLUGIN_ACTIONS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) _MYSQL_DO_PLUGIN_ACTIONS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
_MYSQL_POST_PLUGIN_FIXUP()
]) dnl ]) dnl
]) dnl ]) dnl
]) ])
@ -661,5 +662,22 @@ _MYSQL_MODULE_ARGS_CHECK(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
_MYSQL_CHECK_DEPENDENCIES(m4_bpatsubst(__mysql_plugin_list__, :, [,])) _MYSQL_CHECK_DEPENDENCIES(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
]) ])
AC_DEFUN([_MYSQL_POST_PLUGIN_FIXUP],[
for plugdir in $mysql_plugin_dirs; do
case "$plugdir" in
storage/* )
mysql_se_dirs="$mysql_se_dirs `echo $plugdir | sed -e 's@^storage/@@'`"
;;
plugin/* )
mysql_pg_dirs="$mysql_pg_dirs `echo $plugdir | sed -e 's@^plugin/@@'`"
;;
*)
AC_MSG_ERROR([don't know how to handle plugin dir $plugdir])
;;
esac
done
AC_SUBST(mysql_se_dirs)
AC_SUBST(mysql_pg_dirs)
])
dnl =========================================================================== dnl ===========================================================================

2
sql/sql_plugin.cc
View File

@ -531,7 +531,7 @@ static int plugin_initialize(struct st_plugin_int *plugin)
switch (plugin->plugin->type) switch (plugin->plugin->type)
{ {
case MYSQL_STORAGE_ENGINE_PLUGIN: case MYSQL_STORAGE_ENGINE_PLUGIN:
if (ha_initialize_handlerton((handlerton*) plugin->plugin->info)) if (ha_initialize_handlerton(plugin))
{ {
sql_print_error("Plugin '%s' handlerton init returned error.", sql_print_error("Plugin '%s' handlerton init returned error.",
plugin->name.str); plugin->name.str);