← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

pandora-build v0.42 - Started splitting out plugin system into pandora-build

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
128
128
 
129
129
 
130
130
StorageEngine* innodb_engine_ptr= NULL;
131
 
#ifdef DRIZZLE_DYNAMIC_PLUGIN
 
131
#ifdef PANDORA_DYNAMIC_PLUGIN
132
132
/* These must be weak global variables in the dynamic plugin. */
133
133
#ifdef __WIN__
134
134
struct drizzled::plugin::Manifest*      builtin_innobase_plugin_ptr;
143
143
innodb_plugin_init(void);
144
144
/*====================*/
145
145
                /* out: TRUE if the dynamic InnoDB plugin should start */
146
 
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
 
146
#endif /* PANDORA_DYNAMIC_PLUGIN */
147
147
 
148
148
static const long AUTOINC_OLD_STYLE_LOCKING = 0;
149
149
static const long AUTOINC_NEW_STYLE_LOCKING = 1;
1632
1632
 
1633
1633
        innodb_engine_ptr= new InnobaseEngine(innobase_engine_name);
1634
1634
 
1635
 
#ifdef DRIZZLE_DYNAMIC_PLUGIN
 
1635
#ifdef PANDORA_DYNAMIC_PLUGIN
1636
1636
        if (!innodb_plugin_init()) {
1637
1637
                errmsg_printf(ERRMSG_LVL_ERROR, "InnoDB plugin init failed.");
1638
1638
                return -1;
1639
1639
        }
1640
 
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
 
1640
#endif /* PANDORA_DYNAMIC_PLUGIN */
1641
1641
 
1642
1642
        ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)DRIZZLE_TYPE_VARCHAR);
1643
1643
 
9011
9011
  NULL
9012
9012
};
9013
9013
 
9014
 
#ifdef DRIZZLE_DYNAMIC_PLUGIN
 
9014
#ifdef PANDORA_DYNAMIC_PLUGIN
9015
9015
struct st_mysql_sys_var
9016
9016
{
9017
9017
        DRIZZLE_PLUGIN_VAR_HEADER;
9160
9160
 
9161
9161
        return(true);
9162
9162
}
9163
 
#endif /* DRIZZLE_DYNAMIC_PLUGIN */
 
9163
#endif /* PANDORA_DYNAMIC_PLUGIN */
9164
9164
 
9165
9165
drizzle_declare_plugin(innobase)
9166
9166
{