Commit 9dadc39f authored by unknown's avatar unknown
Browse files

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

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


sql/sql_plugin.cc:
  SCCS merged
parents 338707ad f34a66de

sql/sql_plugin.cc

+2 −9
Original line number Diff line number Diff line
@@ -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));

    sql_print_error("Storage Engine plugins are unsupported in this version.");

    goto err;

    }

    break;

  default:

    break;

  }