Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  zim.tangent.org:/home/brian/mysql/dep-5.1
This commit is contained in:
brian@zim.tangent.org 2006-02-17 16:06:08 -08:00
commit e4ce125d79

View File

@ -526,15 +526,8 @@ static int plugin_initialize(struct st_plugin_int *plugin)
switch (plugin->plugin->type)
{
case MYSQL_STORAGE_ENGINE_PLUGIN:
if (ha_initialize_handlerton((handlerton*) plugin->plugin->info))
{
sql_print_error("Plugin '%s' handlerton init returned error.",
plugin->name.str);
DBUG_PRINT("warning", ("Plugin '%s' handlerton init returned error.",
plugin->name.str));
goto err;
}
break;
sql_print_error("Storage Engine plugins are unsupported in this version.");
goto err;
default:
break;
}