← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Moved StorageEngine into plugin namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
124
124
#endif /* MYSQL_DYNAMIC_PLUGIN && __WIN__ */
125
125
 
126
126
 
127
 
StorageEngine* innodb_engine_ptr= NULL;
 
127
drizzled::plugin::StorageEngine* innodb_engine_ptr= NULL;
128
128
#ifdef PANDORA_DYNAMIC_PLUGIN
129
129
/* These must be weak global variables in the dynamic plugin. */
130
130
#ifdef __WIN__
221
221
static INNOBASE_SHARE *get_share(const char *table_name);
222
222
static void free_share(INNOBASE_SHARE *share);
223
223
 
224
 
class InnobaseEngine : public StorageEngine
 
224
class InnobaseEngine : public drizzled::plugin::StorageEngine
225
225
{
226
226
public:
227
227
  InnobaseEngine(string name_arg)
228
 
   : StorageEngine(name_arg, HTON_NO_FLAGS, sizeof(trx_named_savept_t))
 
228
   : drizzled::plugin::StorageEngine(name_arg,
 
229
                                     HTON_NO_FLAGS, sizeof(trx_named_savept_t))
229
230
  {
230
231
    addAlias("INNOBASE");
231
232
  }
1279
1280
/*************************************************************************
1280
1281
Construct ha_innobase handler. */
1281
1282
UNIV_INTERN
1282
 
ha_innobase::ha_innobase(StorageEngine *engine_arg, TableShare *table_arg)
 
1283
ha_innobase::ha_innobase(drizzled::plugin::StorageEngine *engine_arg,
 
1284
                         TableShare *table_arg)
1283
1285
  :handler(engine_arg, table_arg),
1284
1286
  int_table_flags(HA_REC_NOT_IN_SEQ |
1285
1287
                  HA_NULL_IN_KEY |
1349
1351
void
1350
1352
innobase_register_stmt(
1351
1353
/*===================*/
1352
 
        StorageEngine*  engine, /* in: Innobase engine */
 
1354
        drizzled::plugin::StorageEngine*        engine, /* in: Innobase engine */
1353
1355
        Session*        session)        /* in: MySQL session (connection) object */
1354
1356
{
1355
1357
        assert(engine == innodb_engine_ptr);
1368
1370
void
1369
1371
innobase_register_trx_and_stmt(
1370
1372
/*===========================*/
1371
 
        StorageEngine *engine, /* in: Innobase StorageEngine */
 
1373
        drizzled::plugin::StorageEngine *engine, /* in: Innobase StorageEngine */
1372
1374
        Session*        session)        /* in: MySQL session (connection) object */
1373
1375
{
1374
1376
        /* NOTE that actually innobase_register_stmt() registers also
7352
7354
bool
7353
7355
innodb_show_status(
7354
7356
/*===============*/
7355
 
        StorageEngine*  engine, /* in: the innodb StorageEngine */
 
7357
        drizzled::plugin::StorageEngine*        engine, /* in: the innodb StorageEngine */
7356
7358
        Session*        session,        /* in: the MySQL query thread of the caller */
7357
7359
        stat_print_fn *stat_print)
7358
7360
{
7439
7441
bool
7440
7442
innodb_mutex_show_status(
7441
7443
/*=====================*/
7442
 
        StorageEngine*  engine,
 
7444
        drizzled::plugin::StorageEngine*        engine,
7443
7445
        Session*        session,                /* in: the MySQL query thread of the
7444
7446
                                        caller */
7445
7447
        stat_print_fn*  stat_print)