← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Brian Aker
  • Date: 2009-08-20 22:37:23 UTC
  • mfrom: (1115.3.10 captain)
  • Revision ID: brian@gaz-20090820223723-mi4rirwlvuerj345
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
125
125
 
126
126
 
127
127
StorageEngine* innodb_engine_ptr= NULL;
128
 
#ifdef DRIZZLE_DYNAMIC_PLUGIN
 
128
#ifdef PANDORA_DYNAMIC_PLUGIN
129
129
/* These must be weak global variables in the dynamic plugin. */
130
130
#ifdef __WIN__
131
131
struct drizzled::plugin::Manifest*      builtin_innobase_plugin_ptr;
140
140
innodb_plugin_init(void);
141
141
/*====================*/
142
142
                /* out: TRUE if the dynamic InnoDB plugin should start */
143
 
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
 
143
#endif /* PANDORA_DYNAMIC_PLUGIN */
144
144
 
145
145
static const long AUTOINC_OLD_STYLE_LOCKING = 0;
146
146
static const long AUTOINC_NEW_STYLE_LOCKING = 1;
1629
1629
 
1630
1630
        innodb_engine_ptr= new InnobaseEngine(innobase_engine_name);
1631
1631
 
1632
 
#ifdef DRIZZLE_DYNAMIC_PLUGIN
 
1632
#ifdef PANDORA_DYNAMIC_PLUGIN
1633
1633
        if (!innodb_plugin_init()) {
1634
1634
                errmsg_printf(ERRMSG_LVL_ERROR, "InnoDB plugin init failed.");
1635
1635
                return -1;
1636
1636
        }
1637
 
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
 
1637
#endif /* PANDORA_DYNAMIC_PLUGIN */
1638
1638
 
1639
1639
        ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)DRIZZLE_TYPE_VARCHAR);
1640
1640
 
8983
8983
  NULL
8984
8984
};
8985
8985
 
8986
 
#ifdef DRIZZLE_DYNAMIC_PLUGIN
 
8986
#ifdef PANDORA_DYNAMIC_PLUGIN
8987
8987
struct st_mysql_sys_var
8988
8988
{
8989
8989
        DRIZZLE_PLUGIN_VAR_HEADER;
9132
9132
 
9133
9133
        return(true);
9134
9134
}
9135
 
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
 
9135
#endif /* PANDORA_DYNAMIC_PLUGIN */
9136
9136
 
9137
9137
drizzle_declare_plugin(innobase)
9138
9138
{