Commit e392d54c authored by unknown's avatar unknown
Browse files

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

into  zim.(none):/tmp/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged
parents a418c8f5 2dfaa669

include/mysql/plugin.h

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ __MYSQL_DECLARE_PLUGIN(NAME, \ 
                 builtin_ ## NAME ## _sizeof_struct_st_plugin, \

                 builtin_ ## NAME ## _plugin)



#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0}}

#define mysql_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0,0}}



/*

  declarations for SHOW STATUS support in plugins
@@ -96,6 +96,8 @@ struct st_mysql_plugin 
  int (*deinit)(void);  /* the function to invoke when plugin is unloaded */

  unsigned int version; /* plugin version (for SHOW PLUGINS)            */

  struct st_mysql_show_var *status_vars;

  void * __reserved1;   /* placeholder for system variables             */

  void * __reserved2;   /* placeholder for config options               */

};



/*************************************************************************

plugin/fulltext/plugin_example.c

+3 −1
Original line number Diff line number Diff line
@@ -225,7 +225,9 @@ mysql_declare_plugin(ftexample) 
  simple_parser_plugin_init,  /* init function (when loaded)     */

  simple_parser_plugin_deinit,/* deinit function (when unloaded) */

  0x0001,                     /* version                         */

  simple_status               /* status variables                */

  simple_status,              /* status variables                */

  NULL,                       /* system variables                */

  NULL                        /* config options                  */

}

mysql_declare_plugin_end;

sql/ha_innodb.cc

+3 −1
Original line number Diff line number Diff line
@@ -7623,7 +7623,9 @@ mysql_declare_plugin(innobase) 
  innobase_init, /* Plugin Init */

  NULL, /* Plugin Deinit */

  0x0100 /* 1.0 */,

  innodb_status_variables_export

  innodb_status_variables_export,/* status variables             */

  NULL,                       /* system variables                */

  NULL                        /* config options                  */

}

mysql_declare_plugin_end;

sql/ha_ndbcluster.cc

+5 −1
Original line number Diff line number Diff line
@@ -6388,6 +6388,8 @@ static int ndbcluster_init() 
#endif

    h.flags=            HTON_CAN_RECREATE | HTON_TEMPORARY_NOT_SUPPORTED;

    h.discover=         ndbcluster_discover;

    h.find_files= ndbcluster_find_files;

    h.table_exists_in_engine= ndbcluster_table_exists_in_engine;

  }



  if (have_ndbcluster != SHOW_OPTION_YES)
@@ -10596,7 +10598,9 @@ mysql_declare_plugin(ndbcluster) 
  ndbcluster_init, /* Plugin Init */

  NULL, /* Plugin Deinit */

  0x0100 /* 1.0 */,

  ndb_status_variables_export

  ndb_status_variables_export,/* status variables                */

  NULL,                       /* system variables                */

  NULL                        /* config options                  */

}

mysql_declare_plugin_end;

sql/ha_partition.cc

+3 −1
Original line number Diff line number Diff line
@@ -5598,7 +5598,9 @@ mysql_declare_plugin(partition) 
  partition_initialize, /* Plugin Init */

  NULL, /* Plugin Deinit */

  0x0100, /* 1.0 */

  0

  NULL,                       /* status variables                */

  NULL,                       /* system variables                */

  NULL                        /* config options                  */

}

mysql_declare_plugin_end;