← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Brian Aker
  • Date: 2009-04-29 01:45:36 UTC
  • mfrom: (1000.1.6 merge)
  • Revision ID: brian@gaz-20090429014536-pwu5m8ug6n8fvh68
Merge refactoring (mainly around TABLE_SHARE... one step forward...)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
126
126
}
127
127
 
128
128
 
129
 
handler *get_new_handler(TABLE_SHARE *share, MEM_ROOT *alloc,
 
129
handler *get_new_handler(TableShare *share, MEM_ROOT *alloc,
130
130
                         StorageEngine *engine)
131
131
{
132
132
  handler *file;
581
581
int ha_delete_table(Session *session, const char *path,
582
582
                    const char *db, const char *alias, bool generate_warning)
583
583
{
584
 
  TABLE_SHARE dummy_share;
 
584
  TableShare dummy_share;
585
585
  Table dummy_table;
586
586
  memset(&dummy_table, 0, sizeof(dummy_table));
587
587
  memset(&dummy_share, 0, sizeof(dummy_share));
657
657
  Table table;
658
658
  char name_buff[FN_REFLEN];
659
659
  const char *name;
660
 
  TABLE_SHARE share;
 
660
  TableShare share;
661
661
 
662
 
  init_tmp_table_share(session, &share, db, 0, table_name, path);
663
 
  if (open_table_def(session, &share, 0) ||
 
662
  share.init(db, 0, table_name, path);
 
663
  if (open_table_def(session, &share) ||
664
664
      open_table_from_share(session, &share, "", 0, (uint32_t) READ_ALL, 0, &table,
665
665
                            OTM_CREATE))
666
666
    goto err;
678
678
    my_error(ER_CANT_CREATE_TABLE, MYF(ME_BELL+ME_WAITTANG), name_buff, error);
679
679
  }
680
680
err:
681
 
  free_table_share(&share);
 
681
  share.free_table_share();
682
682
  return(error != 0);
683
683
}
684
684