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

into  zim.tangent.org:/home/brian/mysql/dep-5.1

1 files changed, 2 insertions, 9 deletions

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 199cf4a6264..2046596c428 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -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;
   }