Merge lp:~jaypipes/drizzle/captain into lp:~drizzle-trunk/drizzle/development

[Jay Pipes]

[Jay Pipes (jaypipes)]

Contains Monty's build-cleanup and plugin class cleanup branches. All tests pass on Linux64, Solaris64, and MacOSX64, with only known exception of drizzledump failure on Solaris and myisamcheck failure on MacOSX.

[lp:~jaypipes/drizzle/captain]

1098. By Brian Aker <brian@gaz> on 2009-07-21

Merge Jay

1099. By Brian Aker <brian@gaz> on 2009-07-23

Mege Jay

1100. By Brian Aker <brian@gaz> on 2009-07-27

Merge

1101. By Brian Aker <brian@gaz> on 2009-07-28

Merge Jay

1102. By Brian Aker <brian@gaz> on 2009-07-28

Merge Stewart

1103. By Brian Aker <brian@gaz> on 2009-07-28

Removal of all basic MRR

1104. By Brian Aker <brian@gaz> on 2009-07-29

Merge of SJ code.

1105. By Brian Aker <brian@gaz> on 2009-07-29

Merge Jay

1106. By Brian Aker <brian@gaz> on 2009-07-29

Merging Monty (which includes new replication)

1107. By Brian Aker <brian@gaz> on 2009-08-03

Collection of Valgrind fixes.

1108. By Brian Aker <brian@gaz> on 2009-08-03

Merge of Brian

1109. By Brian Aker <brian@gaz> on 2009-08-04

Merge Brian

1110. By Brian Aker <brian@gaz> on 2009-08-04

Merge of Monty

1111. By Brian Aker <brian@gaz> on 2009-08-05

Merge Brian

1112. By Brian Aker <brian@gaz> on 2009-08-06

Merge Jay

1113. By Brian Aker <brian@gaz> on 2009-08-10

Merge Monty

1114. By Brian Aker <brian@gaz> on 2009-08-11

lcov dead code removal (merge)

1115. By Brian Aker <brian@gaz> on 2009-08-11

MErge Jay

1116. By Jay Pipes <jpipes@serialcoder> on 2009-08-16

Merges Trond's fix for memory overflow error on Solaris in readdir_r

1117. By Jay Pipes <jpipes@serialcoder> on 2009-08-16

Merge Robert's small fix for client/errname.h

1118. By Jay Pipes <jpipes@serialcoder> on 2009-08-16

Merge Padraig's fix for Bug 311013

1119. By Jay Pipes <jpipes@serialcoder> on 2009-08-16

Merge Padraig's continued cleanup of exec command classes plus a couple merge conflict resolutions...

1120. By Jay Pipes <jpipes@serialcoder> on 2009-08-19

Merge with trunk

1121. By Jay Pipes <jpipes@serialcoder> on 2009-08-19

Merge Padraig's continued cleanup of execution commands

1122. By Jay Pipes <jpipes@serialcoder> on 2009-08-20

Merge trunk

1123. By Jay Pipes <jpipes@serialcoder> on 2009-08-20

Merge and resolve conflicts on pandora build fixes.

1124. By Jay Pipes <jpipes@serialcoder> on 2009-08-20

Merge Monty's bug fix for 409350. HEAP handler incorrectly does not destroy mutex.

1125. By Jay Pipes <jpipes@serialcoder> on 2009-08-20

Merge Padraig's optimizer refactoring around pulling structs into real classes...

1126. By Jay Pipes <jpipes@serialcoder> on 2009-08-20

Merge Padraig's refactoring of MY_BITMAP struct to a proper class interface.

1127. By Jay Pipes <jpipes@serialcoder> on 2009-08-20

Merge plugin slot reorganization from monty

1128. By Jay Pipes <jpipes@serialcoder> on 2009-08-21

Merge Biping's pool of thread plugin improvements.

1129. By Jay Pipes <jpipes@serialcoder> on 2009-08-21

Merge Monty's fixes for extended help and plugin initialization

1130. By Jay Pipes <jpipes@serialcoder> on 2009-08-24

Merge trunk

1131. By Jay Pipes <jpipes@serialcoder> on 2009-08-24

Merge Biping's fix for Solaris std::queue header confusion.

1132. By Jay Pipes <jpipes@serialcoder> on 2009-08-25

Merge trunk

1133. By Jay Pipes <jpipes@serialcoder> on 2009-08-25

Merge Monty's cast corrections.

1134. By Jay Pipes <jpipes@serialcoder> on 2009-08-25

Merge Diego
's fixes and enhancements for logging_x plugins

1135. By Jay Pipes <jpipes@serialcoder> on 2009-08-25

Merging pandora build fixes with support for automake 1.11

1136. By Jay Pipes <jpipes@serialcoder> on 2009-08-25

Merge translations

1137. By Jay Pipes <jpipes@serialcoder> on 2009-08-26

Ignore table raw reader

1138. By Jay Pipes <jpipes@serialcoder> on 2009-08-26

Merge Padraig's continued cleanup of execution commands.

1139. By Jay Pipes <jpipes@serialcoder> on 2009-08-26

Merge pandora build fixes

1140. By Jay Pipes <jpipes@serialcoder> on 2009-09-09

Merge trunk

Unmerged revisions

1140. By Jay Pipes <jpipes@serialcoder> on 2009-09-09

Merge trunk

1139. By Jay Pipes <jpipes@serialcoder> on 2009-08-26

Merge pandora build fixes

1138. By Jay Pipes <jpipes@serialcoder> on 2009-08-26

Merge Padraig's continued cleanup of execution commands.

1137. By Jay Pipes <jpipes@serialcoder> on 2009-08-26

Ignore table raw reader

=== modified file 'Makefile.am'
--- Makefile.am	2009-07-11 19:23:04 +0000
+++ Makefile.am	2009-07-17 23:20:36 +0000
@@ -128,7 +128,6 @@
 		mysys/charset.cc \
 		mysys/checksum.cc \
 		mysys/default.cc \
-		mysys/default_modify.cc \
 		mysys/dynamic_array.cc \
 		mysys/errors.cc \
 		mysys/hash.cc \

=== modified file 'client/drizzle.1'
--- client/drizzle.1	2009-05-23 23:51:18 +0000
+++ client/drizzle.1	2009-07-17 17:13:52 +0000
@@ -1018,7 +1018,7 @@
 The
 \fBprompt\fR
 command reconfigures the default
-mysql>
+drizzle>
 prompt. The string for defining the prompt can contain the following special sequences.
 .TS
 allbox tab(:);
@@ -1100,7 +1100,7 @@
 \\U
 T}:T{
 Your full
-                \fIuser_name\fR@\fIhost_name\fR
+                \fIuser\fR@\fIhost\fR
                 account name
 T}
 T{

=== modified file 'client/drizzledump.1'
--- client/drizzledump.1	2009-05-23 23:51:18 +0000
+++ client/drizzledump.1	2009-07-17 17:13:52 +0000
@@ -989,19 +989,20 @@
 NULL (\fIunknown value\fR)
 T}:T{
 <field name="\fIcolumn_name\fR"
-                    xsi:nil="true" />
+       xsi:nil="true" />
 T}
 T{
 \'' (\fIempty string\fR)
 T}:T{
-<field
-                    name="\fIcolumn_name\fR"></field>
+<field name="\fIcolumn_name\fR">
+</field>
 T}
 T{
 \'NULL' (\fIstring value\fR)
 T}:T{
-<field
-                    name="\fIcolumn_name\fR">NULL</field>
+<field name="\fIcolumn_name\fR">
+NULL
+</field>
 T}
 .TE
 .sp

=== modified file 'config/uncrustify.cfg'
--- config/uncrustify.cfg	2009-07-10 21:50:02 +0000
+++ config/uncrustify.cfg	2009-07-15 21:16:34 +0000
@@ -60,8 +60,8 @@
 nl_create_if_one_liner=false
 nl_create_for_one_liner=false
 nl_create_while_one_liner=false
-ls_for_split_full=true
-ls_func_split_full=true
+ls_for_split_full=false
+ls_func_split_full=false
 nl_after_multiline_comment=true
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true

=== modified file 'drizzled/Makefile.am'
--- drizzled/Makefile.am	2009-07-12 18:36:46 +0000
+++ drizzled/Makefile.am	2009-07-15 21:47:32 +0000
@@ -267,8 +267,11 @@
 		plugin/applier.h \
 		plugin/authentication.h \
 		plugin/error_message_handler.h \
+		plugin/handle.h \
+		plugin/library.h \
 		plugin/listen.h \
 		plugin/logging_handler.h \
+		plugin/manifest.h \
 		plugin/protocol.h \
 		plugin/qcache.h \
 		plugin/replicator.h \

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2009-07-16 19:30:03 +0000
+++ drizzled/drizzled.cc	2009-07-18 18:11:42 +0000
@@ -2326,10 +2326,7 @@
 #endif
 
   /* Print out all the options including plugin supplied options */
-  my_print_help_inc_plugins(my_long_options, sizeof(my_long_options)/sizeof(my_option));
-
-  puts(_("\nTo see what values a running Drizzle server is using, type\n"
-         "'drizzleadmin variables' instead of 'drizzled --help'."));
+  my_print_help_inc_plugins(my_long_options);
   }
 }
 

=== modified file 'drizzled/plugin.h'
--- drizzled/plugin.h	2009-07-07 09:06:29 +0000
+++ drizzled/plugin.h	2009-07-15 21:30:33 +0000
@@ -31,40 +31,28 @@
 */
 
 
-/* We use the following strings to define licenses for plugins */
-enum plugin_license_type {
-  PLUGIN_LICENSE_PROPRIETARY,
-  PLUGIN_LICENSE_GPL,
-  PLUGIN_LICENSE_BSD,
-  PLUGIN_LICENSE_LGPL,
-  PLUGIN_LICENSE_MAX=PLUGIN_LICENSE_LGPL
-};
-
-const char * const PLUGIN_LICENSE_PROPRIETARY_STRING="PROPRIETARY";
-const char * const PLUGIN_LICENSE_GPL_STRING="GPL";
-const char * const PLUGIN_LICENSE_BSD_STRING="BSD";
-const char * const PLUGIN_LICENSE_LGPL_STRING="LGPL";
-
 /*
   Macros for beginning and ending plugin declarations. Between
   drizzle_declare_plugin and drizzle_declare_plugin_end there should
-  be a drizzled_plugin_manifest struct for each plugin to be declared.
+  be a drizzled::plugin::Manifest for each plugin to be declared.
 */
 
 
 #ifndef DRIZZLE_DYNAMIC_PLUGIN
 #define __DRIZZLE_DECLARE_PLUGIN(NAME, DECLS) \
-struct drizzled_plugin_manifest DECLS[]= {
+drizzled::plugin::Manifest DECLS[]= {
 #else
 #define __DRIZZLE_DECLARE_PLUGIN(NAME, DECLS) \
-struct drizzled_plugin_manifest _mysql_plugin_declarations_[]= {
+drizzled::plugin::Manifest _drizzled_plugin_declaration_[]= {
 #endif
 
 #define drizzle_declare_plugin(NAME) \
 __DRIZZLE_DECLARE_PLUGIN(NAME, \
                  builtin_ ## NAME ## _plugin)
 
-#define drizzle_declare_plugin_end ,{0,0,0,0,0,0,0,0,0,0}}
+#define drizzle_declare_plugin_end ,{0,0,0,0,PLUGIN_LICENSE_GPL,0,0,0,0,0}}
+
+
 
 /*
   the following flags are valid for plugin_init()

=== added file 'drizzled/plugin/handle.h'
--- drizzled/plugin/handle.h	1970-01-01 00:00:00 +0000
+++ drizzled/plugin/handle.h	2009-07-16 00:24:27 +0000
@@ -0,0 +1,68 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2009 Sun Microsystems
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef DRIZZLED_PLUGIN_HANDLE_H
+#define DRIZZLED_PLUGIN_HANDLE_H
+
+#include <drizzled/lex_string.h>
+#include <mysys/my_alloc.h>
+
+class sys_var;
+
+namespace drizzled
+{
+namespace plugin
+{
+
+class Manifest;
+class Library;
+
+/* A handle of a plugin */
+class Handle
+{
+  const std::string name;
+  Manifest *manifest;
+public:
+  Library *plugin_dl;
+  bool isInited;
+  MEM_ROOT mem_root;            /* memory for dynamic plugin structures */
+  sys_var *system_vars;         /* server variables for this plugin */
+  Handle(Manifest *manifest_arg, Library *library_arg)
+    : name(manifest_arg->name), manifest(manifest_arg), plugin_dl(library_arg),
+      mem_root(), system_vars(NULL) {}
+      
+  Handle(Manifest *manifest_arg)
+    : name(manifest_arg->name), manifest(manifest_arg), plugin_dl(NULL),
+      mem_root(), system_vars(NULL) {}
+      
+  const std::string& getName() const
+  {
+    return name;
+  }
+
+  const Manifest& getManifest() const
+  {
+    return *manifest;
+  }
+};
+
+} /* namespace plugin */
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_PLUGIN_HANDLE_H */

=== added file 'drizzled/plugin/library.h'
--- drizzled/plugin/library.h	1970-01-01 00:00:00 +0000
+++ drizzled/plugin/library.h	2009-07-15 21:47:32 +0000
@@ -0,0 +1,45 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2009 Sun Microsystems
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef DRIZZLED_PLUGIN_LIBRARY_H
+#define DRIZZLED_PLUGIN_LIBRARY_H
+
+#include <drizzled/lex_string.h>
+
+namespace drizzled
+{
+namespace plugin
+{
+
+class Manifest;
+
+/* A handle for the dynamic library containing a plugin or plugins. */
+class Library
+{
+public:
+  LEX_STRING dl;
+  void *handle;
+  Manifest *plugins;
+  Library() : dl(), handle(NULL), plugins(NULL) {}
+};
+
+} /* namespace plugin */
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_PLUGIN_LIBRARY_H */

=== added file 'drizzled/plugin/manifest.h'
--- drizzled/plugin/manifest.h	1970-01-01 00:00:00 +0000
+++ drizzled/plugin/manifest.h	2009-07-16 00:24:27 +0000
@@ -0,0 +1,75 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2009 Sun Microsystems
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef DRIZZLED_PLUGIN_MANIFEST_H
+#define DRIZZLED_PLUGIN_MANIFEST_H
+
+#include <drizzled/plugin_registry.h>
+
+struct st_mysql_show_var;
+struct st_mysql_sys_var;
+
+/* We use the following strings to define licenses for plugins */
+enum plugin_license_type {
+  PLUGIN_LICENSE_GPL,
+  PLUGIN_LICENSE_BSD,
+  PLUGIN_LICENSE_LGPL,
+  PLUGIN_LICENSE_PROPRIETARY,
+  PLUGIN_LICENSE_MAX=PLUGIN_LICENSE_LGPL
+};
+
+
+namespace drizzled
+{
+namespace plugin
+{
+
+static const std::string LICENSE_GPL_STRING("GPL");
+static const std::string LICENSE_BSD_STRING("BSD");
+static const std::string LICENSE_LGPL_STRING("LGPL");
+static const std::string LICENSE_PROPRIETARY_STRING("PROPRIETARY");
+
+typedef int (*initialize_func_t)(PluginRegistry &);
+
+/**
+ * Plugin Manfiest
+ *
+ * One Manifest is required per plugin library which is to be dlopened
+ *
+ * This is a struct and not a class because it is staticly defined in the
+ * plugin objects and needs to be a POD as it can, or else it won't compile.
+ */
+struct Manifest
+{
+  const char *name;          /* plugin name (for SHOW PLUGINS)               */
+  const char *version;       /* plugin version (for SHOW PLUGINS)            */
+  const char *author;        /* plugin author (for SHOW PLUGINS)             */
+  const char *descr;         /* general descriptive text (for SHOW PLUGINS ) */
+  plugin_license_type license; /* plugin license (PLUGIN_LICENSE_XXX)          */
+  initialize_func_t init;     /* function to invoke when plugin is loaded     */
+  initialize_func_t deinit;   /* function to invoke when plugin is unloaded   */
+  st_mysql_show_var *status_vars;
+  st_mysql_sys_var **system_vars;
+  void *reserved1;           /* reserved for dependency checking             */
+};
+
+} /* namespace plugin */
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_PLUGIN_MANIFEST_H */

=== modified file 'drizzled/plugin_registry.cc'
--- drizzled/plugin_registry.cc	2009-06-17 18:39:44 +0000
+++ drizzled/plugin_registry.cc	2009-07-16 00:24:27 +0000
@@ -45,21 +45,21 @@
   return the_registry;
 }
 
-st_plugin_int *PluginRegistry::find(const LEX_STRING *name)
+drizzled::plugin::Handle *PluginRegistry::find(const LEX_STRING *name)
 {
   string find_str(name->str,name->length);
   transform(find_str.begin(), find_str.end(), find_str.begin(), ::tolower);
 
-  map<string, st_plugin_int *>::iterator map_iter;
+  map<string, drizzled::plugin::Handle *>::iterator map_iter;
   map_iter= plugin_map.find(find_str);
   if (map_iter != plugin_map.end())
     return (*map_iter).second;
   return(0);
 }
 
-void PluginRegistry::add(st_plugin_int *plugin)
+void PluginRegistry::add(drizzled::plugin::Handle *plugin)
 {
-  string add_str(plugin->name.str);
+  string add_str(plugin->getName());
   transform(add_str.begin(), add_str.end(),
             add_str.begin(), ::tolower);
 
@@ -67,14 +67,14 @@
 }
 
 
-vector<st_plugin_int *> PluginRegistry::get_list(bool active)
+vector<drizzled::plugin::Handle *> PluginRegistry::get_list(bool active)
 {
-  st_plugin_int *plugin= NULL;
+  drizzled::plugin::Handle *plugin= NULL;
 
-  vector <st_plugin_int *> plugins;
+  vector <drizzled::plugin::Handle *> plugins;
   plugins.reserve(plugin_map.size());
 
-  map<string, st_plugin_int *>::iterator map_iter;
+  map<string, drizzled::plugin::Handle *>::iterator map_iter;
   for (map_iter= plugin_map.begin();
        map_iter != plugin_map.end();
        map_iter++)

=== modified file 'drizzled/plugin_registry.h'
--- drizzled/plugin_registry.h	2009-06-26 06:25:57 +0000
+++ drizzled/plugin_registry.h	2009-07-15 21:00:16 +0000
@@ -25,7 +25,6 @@
 #include <vector>
 #include <map>
 
-struct st_plugin_int;
 class StorageEngine;
 class InfoSchemaTable;
 class Function_builder;
@@ -40,13 +39,14 @@
 namespace plugin
 {
 class Replicator;
+class Handle;
 }
 }
 
 class PluginRegistry
 {
 private:
-  std::map<std::string, st_plugin_int *>
+  std::map<std::string, drizzled::plugin::Handle *>
     plugin_map;
 
   PluginRegistry(const PluginRegistry&);
@@ -54,11 +54,11 @@
   PluginRegistry() {}
 
 
-  st_plugin_int *find(const LEX_STRING *name);
-
-  void add(st_plugin_int *plugin);
-
-  std::vector<st_plugin_int *> get_list(bool active);
+  drizzled::plugin::Handle *find(const LEX_STRING *name);
+
+  void add(drizzled::plugin::Handle *plugin);
+
+  std::vector<drizzled::plugin::Handle *> get_list(bool active);
   static PluginRegistry& getPluginRegistry();
 
   void add(StorageEngine *engine);

=== modified file 'drizzled/sql_plugin.cc'
--- drizzled/sql_plugin.cc	2009-06-30 21:28:16 +0000
+++ drizzled/sql_plugin.cc	2009-07-16 17:37:03 +0000
@@ -43,19 +43,21 @@
 #define REPORT_TO_USER 2
 
 using namespace std;
+using namespace drizzled;
+using namespace drizzled::plugin;
  
-typedef struct drizzled_plugin_manifest builtin_plugin[];
+typedef Manifest builtin_plugin[];
 extern builtin_plugin DRIZZLED_BUILTIN_LIST;
-static drizzled_plugin_manifest *drizzled_builtins[]=
+static Manifest *drizzled_builtins[]=
 {
-  DRIZZLED_BUILTIN_LIST,(struct drizzled_plugin_manifest *)0
+  DRIZZLED_BUILTIN_LIST,(Manifest *)0
 };
 
 char *opt_plugin_load= NULL;
 const char *opt_plugin_load_default= QUOTE_ARG(DRIZZLED_PLUGIN_LIST);
 char *opt_plugin_dir_ptr;
 char opt_plugin_dir[FN_REFLEN];
-static const char *plugin_declarations_sym= "_mysql_plugin_declarations_";
+static const char *plugin_declarations_sym= "_drizzled_plugin_declaration_";
 
 /* Note that 'int version' must be the first field of every plugin
    sub-structure (plugin->info).
@@ -122,7 +124,7 @@
 class sys_var_pluginvar: public sys_var
 {
 public:
-  struct st_plugin_int *plugin;
+  Handle *plugin;
   struct st_mysql_sys_var *plugin_var;
 
   static void *operator new(size_t size, MEM_ROOT *mem_root)
@@ -154,10 +156,10 @@
 /* prototypes */
 static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
                              const char *list);
-static int test_plugin_options(MEM_ROOT *, struct st_plugin_int *,
+static int test_plugin_options(MEM_ROOT *, Handle *,
                                int *, char **);
-static bool register_builtin(struct st_plugin_int *,
-                             struct st_plugin_int **);
+static bool register_builtin(Handle *,
+                             Handle **);
 static void unlock_variables(Session *session, struct system_variables *vars);
 static void cleanup_variables(Session *session, struct system_variables *vars);
 static void plugin_vars_free_values(sys_var *vars);
@@ -236,14 +238,14 @@
   Plugin support code
 ****************************************************************************/
 
-static struct st_plugin_dl *plugin_dl_find(const LEX_STRING *dl)
+static Library *plugin_dl_find(const LEX_STRING *dl)
 {
   uint32_t i;
-  struct st_plugin_dl *tmp;
+  Library *tmp;
 
   for (i= 0; i < plugin_dl_array.elements; i++)
   {
-    tmp= *dynamic_element(&plugin_dl_array, i, struct st_plugin_dl **);
+    tmp= *dynamic_element(&plugin_dl_array, i, Library **);
     if (! my_strnncoll(files_charset_info,
                        (const unsigned char *)dl->str, dl->length,
                        (const unsigned char *)tmp->dl.str, tmp->dl.length))
@@ -252,29 +254,29 @@
   return(0);
 }
 
-static st_plugin_dl *plugin_dl_insert_or_reuse(struct st_plugin_dl *plugin_dl)
+static Library *plugin_dl_insert_or_reuse(Library *plugin_dl)
 {
   uint32_t i;
-  struct st_plugin_dl *tmp;
+  Library *tmp;
 
   for (i= 0; i < plugin_dl_array.elements; i++)
   {
-    tmp= *dynamic_element(&plugin_dl_array, i, struct st_plugin_dl **);
+    tmp= *dynamic_element(&plugin_dl_array, i, Library **);
     {
-      memcpy(tmp, plugin_dl, sizeof(struct st_plugin_dl));
+      memcpy(tmp, plugin_dl, sizeof(Library));
       return(tmp);
     }
   }
   if (insert_dynamic(&plugin_dl_array, (unsigned char*)&plugin_dl))
     return(0);
   tmp= *dynamic_element(&plugin_dl_array, plugin_dl_array.elements - 1,
-                        struct st_plugin_dl **)=
-      (struct st_plugin_dl *) memdup_root(&plugin_mem_root, (unsigned char*)plugin_dl,
-                                           sizeof(struct st_plugin_dl));
+                        Library **)=
+      (Library *) memdup_root(&plugin_mem_root, (unsigned char*)plugin_dl,
+                                           sizeof(Library));
   return(tmp);
 }
 
-static inline void free_plugin_mem(struct st_plugin_dl *p)
+static inline void free_plugin_mem(Library *p)
 {
   if (p->handle)
     dlclose(p->handle);
@@ -282,11 +284,11 @@
 }
 
 
-static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
+static Library *plugin_dl_add(const LEX_STRING *dl, int report)
 {
   string dlpath;
   uint32_t plugin_dir_len;
-  struct st_plugin_dl *tmp, plugin_dl;
+  Library *tmp, plugin_dl;
   void *sym;
   plugin_dir_len= strlen(opt_plugin_dir);
   dlpath.reserve(FN_REFLEN);
@@ -345,7 +347,7 @@
     return(0);
   }
 
-  plugin_dl.plugins= (struct drizzled_plugin_manifest *)sym;
+  plugin_dl.plugins= static_cast<Manifest *>(sym);
 
   /* Duplicate and convert dll name */
   plugin_dl.dl.length= dl->length * files_charset_info->mbmaxlen + 1;
@@ -364,9 +366,9 @@
   {
     free_plugin_mem(&plugin_dl);
     if (report & REPORT_TO_USER)
-      my_error(ER_OUTOFMEMORY, MYF(0), sizeof(struct st_plugin_dl));
+      my_error(ER_OUTOFMEMORY, MYF(0), sizeof(Library));
     if (report & REPORT_TO_LOG)
-      errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_OUTOFMEMORY), sizeof(struct st_plugin_dl));
+      errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_OUTOFMEMORY), sizeof(Library));
     return(0);
   }
   return(tmp);
@@ -379,8 +381,8 @@
 
   for (i= 0; i < plugin_dl_array.elements; i++)
   {
-    struct st_plugin_dl *tmp= *dynamic_element(&plugin_dl_array, i,
-                                               struct st_plugin_dl **);
+    Library *tmp= *dynamic_element(&plugin_dl_array, i,
+                                               Library **);
     if (! my_strnncoll(files_charset_info,
                        (const unsigned char *)dl->str, dl->length,
                        (const unsigned char *)tmp->dl.str, tmp->dl.length))
@@ -388,7 +390,7 @@
       /* Do not remove this element, unless no other plugin uses this dll. */
       {
         free_plugin_mem(tmp);
-        memset(tmp, 0, sizeof(struct st_plugin_dl));
+        memset(tmp, 0, sizeof(Library));
       }
       break;
     }
@@ -398,16 +400,13 @@
 
 
 
-static st_plugin_int *plugin_insert_or_reuse(struct st_plugin_int *plugin)
+static Handle *plugin_insert_or_reuse(Handle *plugin)
 {
-  struct st_plugin_int *tmp;
   if (insert_dynamic(&plugin_array, (unsigned char*)&plugin))
     return(0);
-  tmp= *dynamic_element(&plugin_array, plugin_array.elements - 1,
-                        struct st_plugin_int **)=
-       (struct st_plugin_int *) memdup_root(&plugin_mem_root, (unsigned char*)plugin,
-                                            sizeof(struct st_plugin_int));
-  return(tmp);
+  plugin= *dynamic_element(&plugin_array, plugin_array.elements - 1,
+                        Handle **);
+  return(plugin);
 }
 
 
@@ -421,8 +420,7 @@
 {
   PluginRegistry &registry= PluginRegistry::getPluginRegistry();
 
-  struct st_plugin_int tmp;
-  struct drizzled_plugin_manifest *plugin;
+  Manifest *manifest;
   if (! initialized)
     return(0);
 
@@ -434,34 +432,32 @@
       errmsg_printf(ERRMSG_LVL_ERROR, ER(ER_UDF_EXISTS), name->str);
     return(true);
   }
-  /* Clear the whole struct to catch future extensions. */
-  memset(&tmp, 0, sizeof(tmp));
-  if (! (tmp.plugin_dl= plugin_dl_add(dl, report)))
-    return(true);
+  Library *library= plugin_dl_add(dl, report);
+  if (library == NULL)
+    return true;
+
+  Handle *tmp= NULL;
   /* Find plugin by name */
-  for (plugin= tmp.plugin_dl->plugins; plugin->name; plugin++)
+  for (manifest= library->plugins; manifest->name; manifest++)
   {
-    uint32_t name_len= strlen(plugin->name);
     if (! my_strnncoll(system_charset_info,
                        (const unsigned char *)name->str, name->length,
-                       (const unsigned char *)plugin->name,
-                       name_len))
+                       (const unsigned char *)manifest->name,
+                       strlen(manifest->name)))
     {
-      struct st_plugin_int *tmp_plugin_ptr;
+      tmp= new (std::nothrow) Handle(manifest, library);
+      if (tmp == NULL)
+        return true;
 
-      tmp.plugin= plugin;
-      tmp.name.str= (char *)plugin->name;
-      tmp.name.length= name_len;
-      tmp.isInited= false;
-      if (!test_plugin_options(tmp_root, &tmp, argc, argv))
+      if (!test_plugin_options(tmp_root, tmp, argc, argv))
       {
-        if ((tmp_plugin_ptr= plugin_insert_or_reuse(&tmp)))
+        if ((tmp= plugin_insert_or_reuse(tmp)))
         {
-          registry.add(tmp_plugin_ptr);
-          init_alloc_root(&tmp_plugin_ptr->mem_root, 4096, 4096);
+          registry.add(tmp);
+          init_alloc_root(&tmp->mem_root, 4096, 4096);
           return(false);
         }
-        mysql_del_sys_var_chain(tmp.system_vars);
+        mysql_del_sys_var_chain(tmp->system_vars);
         goto err;
       }
       /* plugin was disabled */
@@ -479,18 +475,18 @@
 }
 
 
-static void plugin_del(struct st_plugin_int *plugin)
+static void plugin_del(Handle *plugin)
 {
   PluginRegistry &registry= PluginRegistry::getPluginRegistry();
   if (plugin->isInited)
   {
-    if (plugin->plugin->status_vars)
+    if (plugin->getManifest().status_vars)
     {
-      remove_status_vars(plugin->plugin->status_vars);
+      remove_status_vars(plugin->getManifest().status_vars);
     }
 
-    if (plugin->plugin->deinit)
-      plugin->plugin->deinit(registry);
+    if (plugin->getManifest().deinit)
+      plugin->getManifest().deinit(registry);
   }
 
   /* Free allocated strings before deleting the plugin. */
@@ -501,44 +497,44 @@
   pthread_rwlock_wrlock(&LOCK_system_variables_hash);
   mysql_del_sys_var_chain(plugin->system_vars);
   pthread_rwlock_unlock(&LOCK_system_variables_hash);
-  free_root(&plugin->mem_root, MYF(0));
+  delete plugin;
 }
 
 static void reap_plugins(void)
 {
   size_t count;
   uint32_t idx;
-  struct st_plugin_int *plugin;
+  drizzled::plugin::Handle *plugin;
 
   count= plugin_array.elements;
 
   for (idx= 0; idx < count; idx++)
   {
-    plugin= *dynamic_element(&plugin_array, idx, struct st_plugin_int **);
+    plugin= *dynamic_element(&plugin_array, idx, drizzled::plugin::Handle **);
     plugin_del(plugin);
   }
 }
 
-static bool plugin_initialize(struct st_plugin_int *plugin)
+static bool plugin_initialize(drizzled::plugin::Handle *plugin)
 {
   assert(plugin->isInited == false);
 
   PluginRegistry &registry= PluginRegistry::getPluginRegistry();
-  if (plugin->plugin->init)
+  if (plugin->getManifest().init)
   {
-    if (plugin->plugin->init(registry))
+    if (plugin->getManifest().init(registry))
     {
       errmsg_printf(ERRMSG_LVL_ERROR,
                     _("Plugin '%s' init function returned error.\n"),
-                    plugin->name.str);
+                    plugin->getName().c_str());
       goto err;
     }
   }
   plugin->isInited= true;
 
-  if (plugin->plugin->status_vars)
+  if (plugin->getManifest().status_vars)
   {
-    add_status_vars(plugin->plugin->status_vars); // add_status_vars makes a copy
+    add_status_vars(plugin->getManifest().status_vars); // add_status_vars makes a copy
   }
 
   /*
@@ -584,9 +580,9 @@
 int plugin_init(int *argc, char **argv, int flags)
 {
   uint32_t idx;
-  struct drizzled_plugin_manifest **builtins;
-  struct drizzled_plugin_manifest *plugin;
-  struct st_plugin_int tmp, *plugin_ptr;
+  Manifest **builtins;
+  Manifest *manifest;
+  Handle *handle;
   MEM_ROOT tmp_root;
 
   if (initialized)
@@ -601,9 +597,9 @@
 
 
   if (my_init_dynamic_array(&plugin_dl_array,
-                            sizeof(struct st_plugin_dl *),16,16) ||
+                            sizeof(Library *),16,16) ||
       my_init_dynamic_array(&plugin_array,
-                            sizeof(struct st_plugin_int *),16,16))
+                            sizeof(Handle *),16,16))
     goto err;
 
   initialized= 1;
@@ -613,21 +609,20 @@
   */
   for (builtins= drizzled_builtins; *builtins; builtins++)
   {
-    for (plugin= *builtins; plugin->name; plugin++)
+    for (manifest= *builtins; manifest->name; manifest++)
     {
-      memset(&tmp, 0, sizeof(tmp));
-      tmp.plugin= plugin;
-      tmp.name.str= (char *)plugin->name;
-      tmp.name.length= strlen(plugin->name);
+      handle= new (std::nothrow) Handle(manifest);
+      if (handle == NULL)
+        return true;
 
       free_root(&tmp_root, MYF(MY_MARK_BLOCKS_FREE));
-      if (test_plugin_options(&tmp_root, &tmp, argc, argv))
+      if (test_plugin_options(&tmp_root, handle, argc, argv))
         continue;
 
-      if (register_builtin(&tmp, &plugin_ptr))
+      if (register_builtin(handle, &handle))
         goto err_unlock;
 
-      if (plugin_initialize(plugin_ptr))
+      if (plugin_initialize(handle))
         goto err_unlock;
 
     }
@@ -649,11 +644,11 @@
   */
   for (idx= 0; idx < plugin_array.elements; idx++)
   {
-    plugin_ptr= *dynamic_element(&plugin_array, idx, struct st_plugin_int **);
-    if (plugin_ptr->isInited == false)
+    handle= *dynamic_element(&plugin_array, idx, Handle **);
+    if (handle->isInited == false)
     {
-      if (plugin_initialize(plugin_ptr))
-        plugin_del(plugin_ptr);
+      if (plugin_initialize(handle))
+        plugin_del(handle);
     }
   }
 
@@ -670,8 +665,8 @@
 }
 
 
-static bool register_builtin(struct st_plugin_int *tmp,
-                             struct st_plugin_int **ptr)
+static bool register_builtin(Handle *tmp,
+                             Handle **ptr)
 {
 
   PluginRegistry &registry= PluginRegistry::getPluginRegistry();
@@ -683,9 +678,7 @@
     return(1);
 
   *ptr= *dynamic_element(&plugin_array, plugin_array.elements - 1,
-                         struct st_plugin_int **)=
-        (struct st_plugin_int *) memdup_root(&plugin_mem_root, (unsigned char*)tmp,
-                                             sizeof(struct st_plugin_int));
+                         Handle **);
 
   registry.add(*ptr);
 
@@ -701,8 +694,8 @@
 {
   char buffer[FN_REFLEN];
   LEX_STRING name= {buffer, 0}, dl= {NULL, 0}, *str= &name;
-  struct st_plugin_dl *plugin_dl;
-  struct drizzled_plugin_manifest *plugin;
+  Library *plugin_dl;
+  Manifest *plugin;
   char *p= buffer;
   while (list)
   {
@@ -778,8 +771,8 @@
 {
   uint32_t idx;
   size_t count= plugin_array.elements;
-  vector<st_plugin_int *> plugins;
-  vector<st_plugin_dl *> dl;
+  vector<Handle *> plugins;
+  vector<Library *> dl;
 
   if (initialized)
   {
@@ -803,7 +796,7 @@
   dl.reserve(count);
   for (idx= 0; idx < count; idx++)
     dl.push_back(*dynamic_element(&plugin_dl_array, idx,
-                 struct st_plugin_dl **));
+                 Library **));
   for (idx= 0; idx < count; idx++)
     free_plugin_mem(dl[idx]);
   delete_dynamic(&plugin_dl_array);
@@ -1123,7 +1116,7 @@
 {
   sys_var *var;
   sys_var_pluginvar *pi= NULL;
-  st_plugin_int *plugin;
+  Handle *plugin;
 
   pthread_rwlock_rdlock(&LOCK_system_variables_hash);
   if ((var= intern_find_sys_var(str, length, false)) &&
@@ -1867,10 +1860,10 @@
 }
 
 
-static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
+static int construct_options(MEM_ROOT *mem_root, Handle *tmp,
                              my_option *options, bool can_disable)
 {
-  const char *plugin_name= tmp->plugin->name;
+  const char *plugin_name= tmp->getManifest().name;
   uint32_t namelen= strlen(plugin_name), optnamelen;
   uint32_t buffer_length= namelen * 4 + (can_disable ? 75 : 10);
   char *name= (char*) alloc_root(mem_root, buffer_length) + 1;
@@ -1916,7 +1909,7 @@
     by my_getopt and register_var() in the first pass uses realloc
   */
 
-  for (plugin_option= tmp->plugin->system_vars;
+  for (plugin_option= tmp->getManifest().system_vars;
        plugin_option && *plugin_option; plugin_option++, index++)
   {
     opt= *plugin_option;
@@ -1953,7 +1946,7 @@
     };
   }
 
-  for (plugin_option= tmp->plugin->system_vars;
+  for (plugin_option= tmp->getManifest().system_vars;
        plugin_option && *plugin_option; plugin_option++, index++)
   {
     switch ((opt= *plugin_option)->flags & PLUGIN_VAR_TYPEMASK) {
@@ -2082,24 +2075,24 @@
 }
 
 
-static my_option *construct_help_options(MEM_ROOT *mem_root,
-                                         struct st_plugin_int *p)
+static my_option *construct_help_options(MEM_ROOT *mem_root, Handle *p)
 {
   st_mysql_sys_var **opt;
   my_option *opts;
   bool can_disable;
   uint32_t count= EXTRA_OPTIONS;
 
-  for (opt= p->plugin->system_vars; opt && *opt; opt++, count+= 2) {};
+  for (opt= p->getManifest().system_vars; opt && *opt; opt++, count+= 2) {};
 
-  if (!(opts= (my_option*) alloc_root(mem_root, sizeof(my_option) * count)))
+  opts= (my_option*)alloc_root(mem_root, (sizeof(my_option) * count));
+  if (opts == NULL)
     return NULL;
 
   memset(opts, 0, sizeof(my_option) * count);
 
-  if ((my_strcasecmp(&my_charset_utf8_general_ci, p->name.str, "MyISAM") == 0))
+  if ((my_strcasecmp(&my_charset_utf8_general_ci, p->getName().c_str(), "MyISAM") == 0))
     can_disable= false;
-  else if ((my_strcasecmp(&my_charset_utf8_general_ci, p->name.str, "MEMORY") == 0))
+  else if ((my_strcasecmp(&my_charset_utf8_general_ci, p->getName().c_str(), "MEMORY") == 0))
     can_disable= false;
   else
     can_disable= true;
@@ -2125,7 +2118,7 @@
   NOTE:
     Requires that a write-lock is held on LOCK_system_variables_hash
 */
-static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp,
+static int test_plugin_options(MEM_ROOT *tmp_root, Handle *tmp,
                                int *argc, char **argv)
 {
   struct sys_var_chain chain= { NULL, NULL };
@@ -2140,14 +2133,13 @@
   sys_var *v;
   struct st_bookmark *var;
   uint32_t len, count= EXTRA_OPTIONS;
-  assert(tmp->plugin && tmp->name.str);
 
-  for (opt= tmp->plugin->system_vars; opt && *opt; opt++)
+  for (opt= tmp->getManifest().system_vars; opt && *opt; opt++)
     count+= 2; /* --{plugin}-{optname} and --plugin-{plugin}-{optname} */
 
-  if ((my_strcasecmp(&my_charset_utf8_general_ci, tmp->name.str, "MyISAM") == 0))
+  if ((my_strcasecmp(&my_charset_utf8_general_ci, tmp->getName().c_str(), "MyISAM") == 0))
     can_disable= false;
-  else if ((my_strcasecmp(&my_charset_utf8_general_ci, tmp->name.str, "MEMORY") == 0))
+  else if ((my_strcasecmp(&my_charset_utf8_general_ci, tmp->getName().c_str(), "MEMORY") == 0))
     can_disable= false;
   else
     can_disable= true;
@@ -2156,14 +2148,14 @@
   {
     if (!(opts= (my_option*) alloc_root(tmp_root, sizeof(my_option) * count)))
     {
-      errmsg_printf(ERRMSG_LVL_ERROR, _("Out of memory for plugin '%s'."), tmp->name.str);
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Out of memory for plugin '%s'."), tmp->getName().c_str());
       return(-1);
     }
     memset(opts, 0, sizeof(my_option) * count);
 
     if (construct_options(tmp_root, tmp, opts, can_disable))
     {
-      errmsg_printf(ERRMSG_LVL_ERROR, _("Bad options for plugin '%s'."), tmp->name.str);
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Bad options for plugin '%s'."), tmp->getName().c_str());
       return(-1);
     }
 
@@ -2173,7 +2165,7 @@
     if (error)
     {
        errmsg_printf(ERRMSG_LVL_ERROR, _("Parsing options for plugin '%s' failed."),
-                       tmp->name.str);
+                       tmp->getName().c_str());
        goto err;
     }
   }
@@ -2181,18 +2173,18 @@
   error= 1;
 
   {
-    for (opt= tmp->plugin->system_vars; opt && *opt; opt++)
+    for (opt= tmp->getManifest().system_vars; opt && *opt; opt++)
     {
       if (((o= *opt)->flags & PLUGIN_VAR_NOSYSVAR))
         continue;
 
-      if ((var= find_bookmark(tmp->name.str, o->name, o->flags)))
+      if ((var= find_bookmark(tmp->getName().c_str(), o->name, o->flags)))
         v= new (mem_root) sys_var_pluginvar(var->key + 1, o);
       else
       {
-        len= tmp->name.length + strlen(o->name) + 2;
+        len= tmp->getName().length() + strlen(o->name) + 2;
         varname= (char*) alloc_root(mem_root, len);
-        sprintf(varname,"%s-%s",tmp->name.str,o->name);
+        sprintf(varname,"%s-%s",tmp->getName().c_str(),o->name);
         my_casedn_str(&my_charset_utf8_general_ci, varname);
 
         for (p= varname; *p; p++)
@@ -2216,7 +2208,7 @@
       if (mysql_add_sys_var_chain(chain.first, NULL))
       {
         errmsg_printf(ERRMSG_LVL_ERROR, _("Plugin '%s' has conflicting system variables"),
-                        tmp->name.str);
+                        tmp->getName().c_str());
         goto err;
       }
       tmp->system_vars= chain.first;
@@ -2235,49 +2227,69 @@
   Help Verbose text with Plugin System Variables
 ****************************************************************************/
 
-static int option_cmp(my_option *a, my_option *b)
-{
-  return my_strcasecmp(&my_charset_utf8_general_ci, a->name, b->name);
-}
-
-
-void my_print_help_inc_plugins(my_option *main_options, uint32_t size)
-{
-  DYNAMIC_ARRAY all_options;
-  struct st_plugin_int *p;
+class OptionCmp
+{
+public:
+  bool operator() (const my_option &a, const my_option &b)
+  {
+    return my_strcasecmp(&my_charset_utf8_general_ci, a.name, b.name);
+  }
+};
+
+
+void my_print_help_inc_plugins(my_option *main_options)
+{
+  vector<my_option> all_options;
+  Handle *p;
   MEM_ROOT mem_root;
-  my_option *opt;
+  my_option *opt= NULL;
 
   init_alloc_root(&mem_root, 4096, 4096);
-  my_init_dynamic_array(&all_options, sizeof(my_option), size, size/4);
 
   if (initialized)
     for (uint32_t idx= 0; idx < plugin_array.elements; idx++)
     {
-      p= *dynamic_element(&plugin_array, idx, struct st_plugin_int **);
-
-      if (!p->plugin->system_vars ||
-          !(opt= construct_help_options(&mem_root, p)))
+      p= *dynamic_element(&plugin_array, idx, Handle **);
+
+      if (p->getManifest().system_vars == NULL)
+        continue;
+
+      opt= construct_help_options(&mem_root, p);
+      if (opt == NULL)
         continue;
 
       /* Only options with a non-NULL comment are displayed in help text */
       for (;opt->id; opt++)
+      {
         if (opt->comment)
-          insert_dynamic(&all_options, (unsigned char*) opt);
+        {
+          all_options.push_back(*opt);
+          
+        }
+      }
     }
 
   for (;main_options->id; main_options++)
-    insert_dynamic(&all_options, (unsigned char*) main_options);
+  {
+    if (main_options->comment)
+    {
+      all_options.push_back(*main_options);
+    }
+  }
 
-  sort_dynamic(&all_options, (qsort_cmp) option_cmp);
+  /** 
+   * @TODO: Fix the my_option building so that it doens't break sort
+   *
+   * sort(all_options.begin(), all_options.end(), OptionCmp());
+   */
 
   /* main_options now points to the empty option terminator */
-  insert_dynamic(&all_options, (unsigned char*) main_options);
-
-  my_print_help((my_option*) all_options.buffer);
-  my_print_variables((my_option*) all_options.buffer);
-
-  delete_dynamic(&all_options);
+  all_options.push_back(*main_options);
+
+  my_print_help(&*(all_options.begin()));
+  my_print_variables(&*(all_options.begin()));
+
   free_root(&mem_root, MYF(0));
+
 }
 

=== modified file 'drizzled/sql_plugin.h'
--- drizzled/sql_plugin.h	2009-07-07 09:06:29 +0000
+++ drizzled/sql_plugin.h	2009-07-16 17:37:03 +0000
@@ -36,63 +36,15 @@
 #ifndef DRIZZLE_SERVER_PLUGIN_H
 #define DRIZZLE_SERVER_PLUGIN_H
 
-#include <drizzled/lex_string.h>
-#include <mysys/my_alloc.h>
-#include <drizzled/plugin_registry.h>
 #include <drizzled/plugin.h>
+#include <drizzled/plugin/manifest.h>
+#include <drizzled/plugin/library.h>
+#include <drizzled/plugin/handle.h>
 
+class Session;
 class sys_var;
-class Session;
-
-
-/* A handle for the dynamic library containing a plugin or plugins. */
-struct drizzled_plugin_manifest;
-
-struct st_plugin_dl
-{
-  LEX_STRING dl;
-  void *handle;
-  struct drizzled_plugin_manifest *plugins;
-};
-
-/* A handle of a plugin */
-
-struct st_plugin_int
-{
-  LEX_STRING name;
-  struct drizzled_plugin_manifest *plugin;
-  struct st_plugin_dl *plugin_dl;
-  bool isInited;
-  MEM_ROOT mem_root;            /* memory for dynamic plugin structures */
-  sys_var *system_vars;         /* server variables for this plugin */
-};
-
-
-#define plugin_decl(pi) ((pi)->plugin)
-#define plugin_data(pi,cast) (static_cast<cast>((pi)->data))
-#define plugin_name(pi) (&((pi)->name))
-#define plugin_equals(p1,p2) ((p1) && (p2) && (p1) == (p2))
-
-
-typedef int (*plugin_type_init)(PluginRegistry &);
-
-/*
-  Plugin description structure.
-*/
-
-struct drizzled_plugin_manifest
-{
-  const char *name;          /* plugin name (for SHOW PLUGINS)               */
-  const char *version;       /* plugin version (for SHOW PLUGINS)            */
-  const char *author;        /* plugin author (for SHOW PLUGINS)             */
-  const char *descr;         /* general descriptive text (for SHOW PLUGINS ) */
-  int license;               /* plugin license (PLUGIN_LICENSE_XXX)          */
-  plugin_type_init init;     /* function to invoke when plugin is loaded     */
-  plugin_type_init deinit;   /* function to invoke when plugin is unloaded   */
-  struct st_mysql_show_var *status_vars;
-  struct st_mysql_sys_var **system_vars;
-  void *reserved1;           /* reserved for dependency checking             */
-};
+typedef struct st_mysql_lex_string LEX_STRING;
+struct my_option;
 
 extern char *opt_plugin_load;
 extern char *opt_plugin_dir_ptr;
@@ -100,12 +52,12 @@
 
 extern int plugin_init(int *argc, char **argv, int init_flags);
 extern void plugin_shutdown(void);
-extern void my_print_help_inc_plugins(struct my_option *options, uint32_t size);
+extern void my_print_help_inc_plugins(my_option *options);
 extern bool plugin_is_ready(const LEX_STRING *name, int type);
 extern bool mysql_install_plugin(Session *session, const LEX_STRING *name,
                                  const LEX_STRING *dl);
 extern bool mysql_uninstall_plugin(Session *session, const LEX_STRING *name);
-extern bool plugin_register_builtin(struct drizzled_plugin_manifest *plugin);
+extern bool plugin_register_builtin(drizzled::plugin::Manifest *plugin);
 extern void plugin_sessionvar_init(Session *session);
 extern void plugin_sessionvar_cleanup(Session *session);
 extern sys_var *intern_find_sys_var(const char *str, uint32_t, bool no_error);

=== modified file 'extra/clean_source.sh'
--- extra/clean_source.sh	2009-07-10 21:50:02 +0000
+++ extra/clean_source.sh	2009-07-15 21:16:34 +0000
@@ -15,8 +15,8 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-for file in `ack-grep -f | grep -v innobase | grep -v '\.pb\.'| grep -v bak-header | grep -v '^intl' | grep -v '^config' `; do
+for file in `ack-grep -f | grep -v innobase | grep -v '\.pb\.'| grep -v bak-header | grep -v '^intl' | grep -v '^config' | grep -v '\.am$' | grep -v '\.ac$' | grep -v m4 | grep -v sql_yacc.yy | grep -v '.gperf$' `; do
 	grep Copyright $file >/dev/null 2>&1 || echo "No copyright header in $file"
-	uncrustify -c ../config/uncrustify.cfg --replace $file
+	uncrustify -c config/uncrustify.cfg --replace $file
 done
 

=== modified file 'm4/pandora_warnings.m4'
--- m4/pandora_warnings.m4	2009-07-15 19:22:16 +0000
+++ m4/pandora_warnings.m4	2009-07-17 23:20:36 +0000
@@ -125,7 +125,7 @@
     ])
 
     NO_STRICT_ALIASING="-fno-strict-aliasing -Wno-strict-aliasing"
-    NO_SHADOW="-Wno-shadow"
+    NO_SHADOW="-Wno-shadow -Wno-conversion"
 
     AS_IF([test "$INTELCC" = "yes"],[
       m4_if(PW_LESS_WARNINGS,[no],[

=== modified file 'mysys/base64.cc'
--- mysys/base64.cc	2009-05-03 15:58:12 +0000
+++ mysys/base64.cc	2009-07-17 22:25:54 +0000
@@ -213,9 +213,9 @@
     i++;
 
   end:
-    b[0]= (c >> 16) & 0xff;
-    b[1]= (c >>  8) & 0xff;
-    b[2]= (c >>  0) & 0xff;
+    b[0]= char((c >> 16) & 0xff);
+    b[1]= char((c >>  8) & 0xff);
+    b[2]= char((c >>  0) & 0xff);
 
     for (j=0; j<3-mark; j++)
       *d++= b[j];
@@ -228,7 +228,7 @@
     The variable 'i' is set to 'len' when padding has been read, so it
     does not actually reflect the number of bytes read from 'src'.
    */
-  return i != len ? -1 : d - dst_base;
+  return (i != len) ? -1 : int(d - dst_base);
 }
 
 

=== modified file 'mysys/checksum.cc'
--- mysys/checksum.cc	2009-04-17 21:01:47 +0000
+++ mysys/checksum.cc	2009-07-17 22:25:54 +0000
@@ -30,6 +30,6 @@
 
 ha_checksum my_checksum(ha_checksum crc, const unsigned char *pos, size_t length)
 {
-  return (ha_checksum)crc32((uint32_t)crc, pos, length);
+  return ha_checksum(crc32((uint32_t)crc, pos, uInt(length)));
 }
 

=== modified file 'mysys/default.cc'
--- mysys/default.cc	2009-07-10 21:19:35 +0000
+++ mysys/default.cc	2009-07-17 23:20:36 +0000
@@ -164,7 +164,7 @@
     /* Handle --defaults-group-suffix= */
     uint32_t i;
     const char **extra_groups;
-    const uint32_t instance_len= strlen(my_defaults_group_suffix);
+    const size_t instance_len= strlen(my_defaults_group_suffix);
     struct handle_option_ctx *ctx= (struct handle_option_ctx*) func_ctx;
     char *ptr;
     TYPELIB *group= ctx->group;
@@ -176,7 +176,7 @@
 
     for (i= 0; i < group->count; i++)
     {
-      uint32_t len;
+      size_t len;
       extra_groups[i]= group->type_names[i]; /** copy group */
 
       len= strlen(extra_groups[i]);
@@ -455,8 +455,8 @@
     memcpy(res+1+args.elements, *argv + 1, (*argc-1)*sizeof(char*));
   res[args.elements+ *argc]=0;			/* last null */
 
-  (*argc)+=args.elements;
-  *argv= (char**) res;
+  (*argc)+=int(args.elements);
+  *argv= static_cast<char**>(res);
   *(MEM_ROOT*) ptr= alloc;			/* Save alloc root for free */
   delete_dynamic(&args);
   if (found_print_defaults)

=== removed file 'mysys/default_modify.cc'
--- mysys/default_modify.cc	2009-06-30 21:28:16 +0000
+++ mysys/default_modify.cc	1970-01-01 00:00:00 +0000
@@ -1,252 +0,0 @@
-/* Copyright (C) 2005 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#include "mysys/mysys_priv.h"
-#include <mystrings/m_string.h>
-#include <mysys/my_dir.h>
-
-#include <stdio.h>
-#include <algorithm>
-
-using namespace std;
-
-#define BUFF_SIZE 1024
-#define RESERVE 1024                   /* Extend buffer with this extent */
-
-#define NEWLINE "\n"
-#define NEWLINE_LEN 1
-
-static char *add_option(char *dst, const char *option_value,
-			const char *option, int remove_option);
-
-
-/*
-  Add/remove option to the option file section.
-
-  SYNOPSYS
-    modify_defaults_file()
-    file_location     The location of configuration file to edit
-    option            The name of the option to look for (can be NULL)
-    option value      The value of the option we would like to set (can be NULL)
-    section_name      The name of the section (must be NOT NULL)
-    remove_option     This defines what we want to remove:
-                        - MY_REMOVE_NONE -- nothing to remove;
-                        - MY_REMOVE_OPTION -- remove the specified option;
-                        - MY_REMOVE_SECTION -- remove the specified section;
-  IMPLEMENTATION
-    We open the option file first, then read the file line-by-line,
-    looking for the section we need. At the same time we put these lines
-    into a buffer. Then we look for the option within this section and
-    change/remove it. In the end we get a buffer with modified version of the
-    file. Then we write it to the file, truncate it if needed and close it.
-    Note that there is a small time gap, when the file is incomplete,
-    and this theoretically might introduce a problem.
-
-  RETURN
-    0 - ok
-    1 - some error has occured. Probably due to the lack of resourses
-    2 - cannot open the file
-*/
-
-int modify_defaults_file(const char *file_location, const char *option,
-                         const char *option_value,
-                         const char *section_name, int remove_option)
-{
-  FILE *cnf_file;
-  struct stat file_stat;
-  char linebuff[BUFF_SIZE], *src_ptr, *dst_ptr, *file_buffer;
-  size_t opt_len= 0, optval_len= 0, sect_len;
-  uint32_t nr_newlines= 0;
-  size_t buffer_size;
-  bool in_section= false, opt_applied= 0;
-  size_t reserve_extended;
-  uint32_t new_opt_len;
-  int reserve_occupied= 0;
-
-  if (!(cnf_file= fopen(file_location, "r+")))
-    return(2);
-
-  if (fstat(fileno(cnf_file), &file_stat))
-    goto malloc_err;
-
-  if (option && option_value)
-  {
-    opt_len= strlen(option);
-    optval_len= strlen(option_value);
-  }
-
-  new_opt_len= opt_len + 1 + optval_len + NEWLINE_LEN;
-
-  /* calculate the size of the buffer we need */
-  reserve_extended= (opt_len +
-                     1 +                        /* For '=' char */
-                     optval_len +               /* Option value len */
-                     NEWLINE_LEN +              /* Space for newline */
-                     RESERVE);                  /* Some additional space */
-
-  buffer_size= (size_t)max((uint64_t)file_stat.st_size + 1, (uint64_t)SIZE_MAX);
-
-  /*
-    Reserve space to read the contents of the file and some more
-    for the option we want to add.
-  */
-  if (!(file_buffer= (char*) malloc(max(buffer_size + reserve_extended,
-                                        (size_t)SIZE_MAX))))
-    goto malloc_err;
-
-  sect_len= strlen(section_name);
-
-  for (dst_ptr= file_buffer; fgets(linebuff, BUFF_SIZE, cnf_file); )
-  {
-    /* Skip over whitespaces */
-    for (src_ptr= linebuff; my_isspace(&my_charset_utf8_general_ci, *src_ptr);
-	 src_ptr++)
-    {}
-
-    if (!*src_ptr) /* Empty line */
-    {
-      nr_newlines++;
-      continue;
-    }
-
-    /* correct the option (if requested) */
-    if (option && in_section && !strncmp(src_ptr, option, opt_len) &&
-        (*(src_ptr + opt_len) == '=' ||
-         my_isspace(&my_charset_utf8_general_ci, *(src_ptr + opt_len)) ||
-         *(src_ptr + opt_len) == '\0'))
-    {
-      char *old_src_ptr= src_ptr;
-      src_ptr= strchr(src_ptr+ opt_len, '\0');        /* Find the end of the line */
-
-      /* could be negative */
-      reserve_occupied+= (int) new_opt_len - (int) (src_ptr - old_src_ptr);
-      if (reserve_occupied >= (int) reserve_extended)
-      {
-        reserve_extended= (uint32_t) reserve_occupied + RESERVE;
-        if (!(file_buffer= (char*) realloc(file_buffer, buffer_size +
-                                           reserve_extended)))
-          goto malloc_err;
-      }
-      opt_applied= 1;
-      dst_ptr= add_option(dst_ptr, option_value, option, remove_option);
-    }
-    else
-    {
-      /*
-        If we are going to the new group and have an option to apply, do
-        it now. If we are removing a single option or the whole section
-        this will only trigger opt_applied flag.
-      */
-
-      if (in_section && !opt_applied && *src_ptr == '[')
-      {
-        dst_ptr= add_option(dst_ptr, option_value, option, remove_option);
-        opt_applied= 1;           /* set the flag to do write() later */
-        reserve_occupied= new_opt_len+ opt_len + 1 + NEWLINE_LEN;
-      }
-
-      for (; nr_newlines; nr_newlines--)
-        dst_ptr= strcpy(dst_ptr, NEWLINE)+NEWLINE_LEN;
-
-      /* Skip the section if MY_REMOVE_SECTION was given */
-      if (!in_section || remove_option != MY_REMOVE_SECTION)
-        dst_ptr= strcpy(dst_ptr, linebuff);
-        dst_ptr+= strlen(linebuff);
-    }
-    /* Look for a section */
-    if (*src_ptr == '[')
-    {
-      /* Copy the line to the buffer */
-      if (!strncmp(++src_ptr, section_name, sect_len))
-      {
-        src_ptr+= sect_len;
-        /* Skip over whitespaces. They are allowed after section name */
-        for (; my_isspace(&my_charset_utf8_general_ci, *src_ptr); src_ptr++)
-        {}
-
-        if (*src_ptr != ']')
-        {
-          in_section= false;
-          continue; /* Missing closing parenthesis. Assume this was no group */
-        }
-
-        if (remove_option == MY_REMOVE_SECTION)
-          dst_ptr= dst_ptr - strlen(linebuff);
-
-        in_section= true;
-      }
-      else
-        in_section= false; /* mark that this section is of no interest to us */
-    }
-  }
-
-  /*
-    File ended. Apply an option or set opt_applied flag (in case of
-    MY_REMOVE_SECTION) so that the changes are saved. Do not do anything
-    if we are removing non-existent option.
-  */
-
-  if (!opt_applied && in_section && (remove_option != MY_REMOVE_OPTION))
-  {
-    /* New option still remains to apply at the end */
-    if (!remove_option && *(dst_ptr - 1) != '\n')
-      dst_ptr= strcpy(dst_ptr, NEWLINE)+NEWLINE_LEN;
-    dst_ptr= add_option(dst_ptr, option_value, option, remove_option);
-    opt_applied= 1;
-  }
-  for (; nr_newlines; nr_newlines--)
-    dst_ptr= strcpy(dst_ptr, NEWLINE)+NEWLINE_LEN;
-
-  if (opt_applied)
-  {
-    /* Don't write the file if there are no changes to be made */
-    if (ftruncate(fileno(cnf_file), (size_t) (dst_ptr - file_buffer)) ||
-        fseeko(cnf_file, 0, SEEK_SET) ||
-        fwrite(file_buffer, 1, (size_t) (dst_ptr - file_buffer), cnf_file))
-      goto err;
-  }
-  if (fclose(cnf_file))
-    return(1);
-
-  free(file_buffer);
-  return(0);
-
-err:
-  free(file_buffer);
-malloc_err:
-  fclose(cnf_file);
-
-  return 1; /* out of resources */
-}
-
-
-static char *add_option(char *dst, const char *option_value,
-			const char *option, int remove_option)
-{
-  if (!remove_option)
-  {
-    dst= strcpy(dst, option);
-    dst+= strlen(option);
-    if (*option_value)
-    {
-      *dst++= '=';
-      dst= strcpy(dst, option_value);
-      dst+= strlen(option_value);
-    }
-    /* add a newline */
-    dst= strcpy(dst, NEWLINE)+NEWLINE_LEN;
-  }
-  return dst;
-}

=== modified file 'mysys/my_bitmap.h'
--- mysys/my_bitmap.h	2009-05-23 00:05:52 +0000
+++ mysys/my_bitmap.h	2009-07-17 22:25:54 +0000
@@ -80,7 +80,7 @@
 
 static inline void bitmap_set_bit(MY_BITMAP const *map, uint32_t bit)
 {
-  ((unsigned char *)map->bitmap)[bit / 8] |= (1 << ((bit) & 7));
+  ((unsigned char *)map->bitmap)[bit / 8] |= (unsigned char)(1 << ((bit) & 7));
 }
 
 static inline void bitmap_flip_bit(MY_BITMAP const *map, uint32_t bit)

=== modified file 'mysys/my_sys.h'
--- mysys/my_sys.h	2009-07-11 06:24:19 +0000
+++ mysys/my_sys.h	2009-07-17 23:20:36 +0000
@@ -71,10 +71,6 @@
 #define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */
 #define MY_GIVE_INFO	2	/* Give time info about process*/
 
-#define MY_REMOVE_NONE    0     /* Params for modify_defaults_file */
-#define MY_REMOVE_OPTION  1
-#define MY_REMOVE_SECTION 2
-
 #define ME_HIGHBYTE	8	/* Shift for colours */
 #define ME_NOCUR	1	/* Don't use curses message */
 #define ME_OLDWIN	2	/* Use old window */
@@ -401,9 +397,6 @@
                                 char **group_suffix);
 extern int load_defaults(const char *conf_file, const char **groups,
 			 int *argc, char ***argv);
-extern int modify_defaults_file(const char *file_location, const char *option,
-                                const char *option_value,
-                                const char *section_name, int remove_option);
 extern int my_search_option_files(const char *conf_file, int *argc,
                                   char ***argv, uint32_t *args_used,
                                   Process_option_func func, void *func_ctx);

=== modified file 'plugin/info_schema/info_schema_methods.cc'
--- plugin/info_schema/info_schema_methods.cc	2009-07-09 01:35:10 +0000
+++ plugin/info_schema/info_schema_methods.cc	2009-07-18 18:11:42 +0000
@@ -330,7 +330,7 @@
   return (0);
 }
 
-class ShowPlugins : public unary_function<st_plugin_int *, bool>
+class ShowPlugins : public unary_function<drizzled::plugin::Handle *, bool>
 {
   Session *session;
   Table *table;
@@ -340,17 +340,17 @@
 
   result_type operator() (argument_type plugin)
   {
-    struct drizzled_plugin_manifest *plug= plugin_decl(plugin);
+    const drizzled::plugin::Manifest &manifest= plugin->getManifest();
     const CHARSET_INFO * const cs= system_charset_info;
 
     table->restoreRecordAsDefault();
 
-    table->field[0]->store(plugin_name(plugin)->str,
-                           plugin_name(plugin)->length, cs);
+    table->field[0]->store(plugin->getName().c_str(),
+                           plugin->getName().size(), cs);
 
-    if (plug->version)
+    if (manifest.version)
     {
-      table->field[1]->store(plug->version, strlen(plug->version), cs);
+      table->field[1]->store(manifest.version, strlen(manifest.version), cs);
       table->field[1]->set_notnull();
     }
     else
@@ -365,9 +365,9 @@
       table->field[2]->store(STRING_WITH_LEN("INACTIVE"), cs);
     }
 
-    if (plug->author)
+    if (manifest.author)
     {
-      table->field[3]->store(plug->author, strlen(plug->author), cs);
+      table->field[3]->store(manifest.author, strlen(manifest.author), cs);
       table->field[3]->set_notnull();
     }
     else
@@ -375,9 +375,9 @@
       table->field[3]->set_null();
     }
 
-    if (plug->descr)
+    if (manifest.descr)
     {
-      table->field[4]->store(plug->descr, strlen(plug->descr), cs);
+      table->field[4]->store(manifest.descr, strlen(manifest.descr), cs);
       table->field[4]->set_notnull();
     }
     else
@@ -385,22 +385,23 @@
       table->field[4]->set_null();
     }
 
-    switch (plug->license) {
+    switch (manifest.license) {
     case PLUGIN_LICENSE_GPL:
-      table->field[5]->store(PLUGIN_LICENSE_GPL_STRING,
-                             strlen(PLUGIN_LICENSE_GPL_STRING), cs);
+      table->field[5]->store(drizzled::plugin::LICENSE_GPL_STRING.c_str(),
+                             drizzled::plugin::LICENSE_GPL_STRING.size(), cs);
       break;
     case PLUGIN_LICENSE_BSD:
-      table->field[5]->store(PLUGIN_LICENSE_BSD_STRING,
-                             strlen(PLUGIN_LICENSE_BSD_STRING), cs);
+      table->field[5]->store(drizzled::plugin::LICENSE_BSD_STRING.c_str(),
+                             drizzled::plugin::LICENSE_BSD_STRING.size(), cs);
       break;
     case PLUGIN_LICENSE_LGPL:
-      table->field[5]->store(PLUGIN_LICENSE_LGPL_STRING,
-                             strlen(PLUGIN_LICENSE_LGPL_STRING), cs);
+      table->field[5]->store(drizzled::plugin::LICENSE_LGPL_STRING.c_str(),
+                             drizzled::plugin::LICENSE_LGPL_STRING.size(), cs);
       break;
     default:
-      table->field[5]->store(PLUGIN_LICENSE_PROPRIETARY_STRING,
-                             strlen(PLUGIN_LICENSE_PROPRIETARY_STRING), cs);
+      table->field[5]->store(drizzled::plugin::LICENSE_PROPRIETARY_STRING.c_str(),
+                             drizzled::plugin::LICENSE_PROPRIETARY_STRING.size(),
+                             cs);
       break;
     }
     table->field[5]->set_notnull();
@@ -414,8 +415,8 @@
   Table *table= tables->table;
 
   PluginRegistry &registry= PluginRegistry::getPluginRegistry();
-  vector<st_plugin_int *> plugins= registry.get_list(true);
-  vector<st_plugin_int *>::iterator iter=
+  vector<drizzled::plugin::Handle *> plugins= registry.get_list(true);
+  vector<drizzled::plugin::Handle *>::iterator iter=
     find_if(plugins.begin(), plugins.end(), ShowPlugins(session, table));
   if (iter != plugins.end())
   {

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2009-07-07 09:06:29 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2009-07-15 21:00:16 +0000
@@ -131,7 +131,7 @@
 #ifdef DRIZZLE_DYNAMIC_PLUGIN
 /* These must be weak global variables in the dynamic plugin. */
 #ifdef __WIN__
-struct drizzled_plugin_manifest*	builtin_innobase_plugin_ptr;
+struct drizzled::plugin::Manifest*	builtin_innobase_plugin_ptr;
 #else
 int builtin_innobase_plugin;
 #endif /* __WIN__ */
@@ -9063,9 +9063,9 @@
 
 	/* Copy the system variables. */
 
-	struct drizzled_plugin_manifest*		builtin;
-	struct st_mysql_sys_var**	sta; /* static parameters */
-	struct st_mysql_sys_var**	dyn; /* dynamic parameters */
+	drizzled::plugin::Manifest*		builtin;
+	st_mysql_sys_var**	sta; /* static parameters */
+	st_mysql_sys_var**	dyn; /* dynamic parameters */
 
 #ifdef __WIN__
 	if (!builtin_innobase_plugin_ptr) {
@@ -9076,7 +9076,7 @@
 	builtin = builtin_innobase_plugin_ptr;
 #else
 
-	builtin = (struct drizzled_plugin_manifest*) &builtin_innobase_plugin;
+	builtin = (drizzled::plugin::Manifest*) &builtin_innobase_plugin;
 #endif
 
 	for (sta = builtin->system_vars; *sta != NULL; sta++) {

=== modified file 'plugin/innobase/handler/win_delay_loader.cc'
--- plugin/innobase/handler/win_delay_loader.cc	2009-04-11 00:30:51 +0000
+++ plugin/innobase/handler/win_delay_loader.cc	2009-07-15 21:00:16 +0000
@@ -76,7 +76,7 @@
 The following is defined in ha_innodb.cc. It is used for copying the
 system variables from the builtin innodb plugin to the dynamic plugin.
 */
-extern struct drizzled_plugin_manifest*	builtin_innobase_plugin_ptr;
+extern drizzled::plugin::Manifest*	builtin_innobase_plugin_ptr;
 
 /***********************************************************************
 The preffered load-address defined in PE (portable executable format).*/
@@ -644,7 +644,7 @@
 		 wdl_binlog_format_names, char*);
 
 	/* It is fine if builtin_innobase_plugin is not available. */
-	builtin_innobase_plugin_ptr = (struct drizzled_plugin_manifest*)
+	builtin_innobase_plugin_ptr = (drizzled::plugin::Manifest*)
 		wdl_get_varaddr_from_map(
 			hmod,
 			"?builtin_innobase_plugin@@3PAUdrizzled_plugin_manifest@@A");