← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2009-03-24 18:05:25 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 964.
  • Revision ID: mordred@inaugust.com-20090324180525-ok5metxsa5yor53k
First step of hton rename.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
4074
4074
      (select_options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) ==
4075
4075
      OPTION_BIG_TABLES || (select_options & TMP_TABLE_FORCE_MYISAM))
4076
4076
  {
4077
 
    share->db_plugin= ha_lock_engine(0, myisam_hton);
 
4077
    share->db_plugin= ha_lock_engine(0, myisam_engine);
4078
4078
    table->file= get_new_handler(share, &table->mem_root,
4079
4079
                                 share->db_type());
4080
4080
    if (group &&
4084
4084
  }
4085
4085
  else
4086
4086
  {
4087
 
    share->db_plugin= ha_lock_engine(0, heap_hton);
 
4087
    share->db_plugin= ha_lock_engine(0, heap_engine);
4088
4088
    table->file= get_new_handler(share, &table->mem_root,
4089
4089
                                 share->db_type());
4090
4090
  }
4234
4234
  if (session->variables.tmp_table_size == ~ (uint64_t) 0)              // No limit
4235
4235
    share->max_rows= ~(ha_rows) 0;
4236
4236
  else
4237
 
    share->max_rows= (ha_rows) (((share->db_type() == heap_hton) ?
 
4237
    share->max_rows= (ha_rows) (((share->db_type() == heap_engine) ?
4238
4238
                                 cmin(session->variables.tmp_table_size,
4239
4239
                                     session->variables.max_heap_table_size) :
4240
4240
                                 session->variables.tmp_table_size) /
4408
4408
  if (session->is_fatal_error)                          // If end of memory
4409
4409
    goto err;                                    /* purecov: inspected */
4410
4410
  share->db_record_offset= 1;
4411
 
  if (share->db_type() == myisam_hton)
 
4411
  if (share->db_type() == myisam_engine)
4412
4412
  {
4413
4413
    if (table->create_myisam_tmp_table(param->keyinfo, param->start_recinfo,
4414
4414
                                       &param->recinfo, select_options))
4760
4760
  const char *save_proc_info;
4761
4761
  int write_err;
4762
4762
 
4763
 
  if (table->s->db_type() != heap_hton ||
 
4763
  if (table->s->db_type() != heap_engine ||
4764
4764
      error != HA_ERR_RECORD_FILE_FULL)
4765
4765
  {
4766
4766
    table->file->print_error(error,MYF(0));
4773
4773
  new_table= *table;
4774
4774
  share= *table->s;
4775
4775
  new_table.s= &share;
4776
 
  new_table.s->db_plugin= ha_lock_engine(session, myisam_hton);
 
4776
  new_table.s->db_plugin= ha_lock_engine(session, myisam_engine);
4777
4777
  if (!(new_table.file= get_new_handler(&share, &new_table.mem_root,
4778
4778
                                        new_table.s->db_type())))
4779
4779
    return(1);                          // End of memory