← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/blackhole/ha_blackhole.cc

  • Committer: Diego Medina
  • Date: 2009-10-05 04:05:29 UTC
  • mfrom: (1161 staging)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: diego.medina@sun.com-20091005040529-5g1qe9gxzslpgefd
resolved small merge issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/blackhole/ha_blackhole.cc
28
28
  NULL
29
29
};
30
30
 
31
 
class BlackholeEngine : public StorageEngine
 
31
class BlackholeEngine : public drizzled::plugin::StorageEngine
32
32
{
33
33
public:
34
34
  BlackholeEngine(const string &name_arg)
35
 
   : StorageEngine(name_arg, HTON_FILE_BASED | HTON_CAN_RECREATE) {}
 
35
   : drizzled::plugin::StorageEngine(name_arg, HTON_FILE_BASED | HTON_CAN_RECREATE) {}
36
36
  virtual handler *create(TableShare *table,
37
37
                          MEM_ROOT *mem_root)
38
38
  {
61
61
** BLACKHOLE tables
62
62
*****************************************************************************/
63
63
 
64
 
ha_blackhole::ha_blackhole(StorageEngine *engine_arg,
 
64
ha_blackhole::ha_blackhole(drizzled::plugin::StorageEngine *engine_arg,
65
65
                           TableShare *table_arg)
66
66
  :handler(engine_arg, table_arg)
67
67
{}
299
299
  return (unsigned char*) share->table_name;
300
300
}
301
301
 
302
 
static StorageEngine *blackhole_engine= NULL;
 
302
static drizzled::plugin::StorageEngine *blackhole_engine= NULL;
303
303
 
304
304
static int blackhole_init(drizzled::plugin::Registry &registry)
305
305
{