← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2009-04-09 15:03:26 UTC
  • mfrom: (971.1.44 mordred)
  • Revision ID: brian@gaz-20090409150326-cu50yn12esijpy1c
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
277
277
  }
278
278
  hash_free(&share->name_hash);
279
279
 
280
 
  share->db_plugin= NULL;
 
280
  share->storage_engine= NULL;
281
281
 
282
282
  /* We must copy mem_root from share because share is allocated through it */
283
283
  memcpy(&mem_root, &share->mem_root, sizeof(mem_root));
410
410
  {
411
411
    LEX_STRING engine_name= { (char*)table.engine().name().c_str(),
412
412
                              strlen(table.engine().name().c_str()) };
413
 
    share->db_plugin= ha_resolve_by_name(session, &engine_name);
 
413
    share->storage_engine= ha_resolve_by_name(session, &engine_name);
414
414
  }
415
415
 
416
416
  share->mysql_version= DRIZZLE_VERSION_ID; // TODO: remove
4073
4073
      (select_options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) ==
4074
4074
      OPTION_BIG_TABLES || (select_options & TMP_TABLE_FORCE_MYISAM))
4075
4075
  {
4076
 
    share->db_plugin= ha_lock_engine(0, myisam_engine);
 
4076
    share->storage_engine= myisam_engine;
4077
4077
    table->file= get_new_handler(share, &table->mem_root,
4078
4078
                                 share->db_type());
4079
4079
    if (group &&
4083
4083
  }
4084
4084
  else
4085
4085
  {
4086
 
    share->db_plugin= ha_lock_engine(0, heap_engine);
 
4086
    share->storage_engine= heap_engine;
4087
4087
    table->file= get_new_handler(share, &table->mem_root,
4088
4088
                                 share->db_type());
4089
4089
  }
4770
4770
  new_table= *table;
4771
4771
  share= *table->s;
4772
4772
  new_table.s= &share;
4773
 
  new_table.s->db_plugin= ha_lock_engine(session, myisam_engine);
 
4773
  new_table.s->storage_engine= myisam_engine;
4774
4774
  if (!(new_table.file= get_new_handler(&share, &new_table.mem_root,
4775
4775
                                        new_table.s->db_type())))
4776
4776
    return(1);                          // End of memory