← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_plugin.cc

  • Committer: Jay Pipes
  • Date: 2009-08-20 17:27:08 UTC
  • mfrom: (1093.9.22 pandora-build)
  • mto: This revision was merged to the branch mainline in revision 1120.
  • Revision ID: jpipes@serialcoder-20090820172708-48n4zi60lviywqj7
Merge and resolve conflicts on pandora build fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_plugin.cc
46
46
using namespace drizzled;
47
47
 
48
48
typedef plugin::Manifest builtin_plugin[];
49
 
extern builtin_plugin DRIZZLED_BUILTIN_LIST;
 
49
extern builtin_plugin PANDORA_BUILTIN_LIST;
50
50
static plugin::Manifest *drizzled_builtins[]=
51
51
{
52
 
  DRIZZLED_BUILTIN_LIST,(plugin::Manifest *)NULL
 
52
  PANDORA_BUILTIN_LIST,(plugin::Manifest *)NULL
53
53
};
54
54
class sys_var_pluginvar;
55
55
static vector<sys_var_pluginvar *> plugin_sysvar_vec;
56
56
 
57
57
char *opt_plugin_load= NULL;
58
 
const char *opt_plugin_load_default= QUOTE_ARG(DRIZZLED_PLUGIN_LIST);
 
58
const char *opt_plugin_load_default= QUOTE_ARG(PANDORA_PLUGIN_LIST);
59
59
char *opt_plugin_dir_ptr;
60
60
char opt_plugin_dir[FN_REFLEN];
61
61
static const char *plugin_declarations_sym= "_drizzled_plugin_declaration_";