← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/blackhole/ha_blackhole.cc

Fixed bashism.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/blackhole/ha_blackhole.cc
41
41
{
42
42
public:
43
43
  BlackholeEngine(const string &name_arg)
44
 
   : drizzled::plugin::StorageEngine(name_arg, HTON_FILE_BASED | HTON_HAS_DATA_DICTIONARY) 
 
44
   : drizzled::plugin::StorageEngine(name_arg, HTON_FILE_BASED | HTON_HAS_DATA_DICTIONARY | HTON_CAN_RECREATE) 
45
45
  {
46
46
    table_definition_ext= BLACKHOLE_EXT;
47
47
  }
48
48
 
49
 
  virtual Cursor *create(TableShare &table,
 
49
  virtual Cursor *create(TableShare *table,
50
50
                          MEM_ROOT *mem_root)
51
51
  {
52
 
    return new (mem_root) ha_blackhole(*this, table);
 
52
    return new (mem_root) ha_blackhole(this, table);
53
53
  }
54
54
 
55
55
  const char **bas_ext() const {
111
111
** BLACKHOLE tables
112
112
*****************************************************************************/
113
113
 
114
 
ha_blackhole::ha_blackhole(drizzled::plugin::StorageEngine &engine_arg,
115
 
                           TableShare &table_arg)
 
114
ha_blackhole::ha_blackhole(drizzled::plugin::StorageEngine *engine_arg,
 
115
                           TableShare *table_arg)
116
116
  :Cursor(engine_arg, table_arg)
117
 
{ }
 
117
{}
118
118
 
119
119
uint32_t ha_blackhole::index_flags(uint32_t inx, uint32_t, bool) const
120
120
{
166
166
 
167
167
int BlackholeEngine::doDropTable(Session&, const string path)
168
168
{
169
 
  string new_path(path);
 
169
  string new_path;
170
170
 
 
171
  new_path= path;
171
172
  new_path+= BLACKHOLE_EXT;
172
173
 
173
 
  int error= unlink(new_path.c_str());
174
 
 
175
 
  if (error != 0)
 
174
  if (unlink(new_path.c_str()) != 0)
176
175
  {
177
 
    error= my_errno= errno;
 
176
    my_errno= errno;
 
177
    return errno;
178
178
  }
179
179
 
180
 
  return error;
 
180
  return 0;
181
181
}
182
182
 
183
183