← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/ha_heap.cc

  • Committer: Brian Aker
  • Date: 2008-10-20 04:28:21 UTC
  • mto: (492.3.21 drizzle-clean-code)
  • mto: This revision was merged to the branch mainline in revision 530.
  • Revision ID: brian@tangent.org-20081020042821-rqqdrccuu8195k3y
Second pass of thd cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/ha_heap.cc
419
419
  return 0;
420
420
}
421
421
 
422
 
int ha_heap::external_lock(Session *thd __attribute__((unused)),
 
422
int ha_heap::external_lock(Session *session __attribute__((unused)),
423
423
                           int lock_type __attribute__((unused)))
424
424
{
425
425
  return 0;                                     // No external locking
533
533
  return heap_indexes_are_disabled(file);
534
534
}
535
535
 
536
 
THR_LOCK_DATA **ha_heap::store_lock(Session *thd __attribute__((unused)),
 
536
THR_LOCK_DATA **ha_heap::store_lock(Session *session __attribute__((unused)),
537
537
                                    THR_LOCK_DATA **to,
538
538
                                    enum thr_lock_type lock_type)
539
539
{
754
754
  hp_create_info.auto_key_type= auto_key_type;
755
755
  hp_create_info.auto_increment= (create_info->auto_increment_value ?
756
756
                                  create_info->auto_increment_value - 1 : 0);
757
 
  hp_create_info.max_table_size=current_thd->variables.max_heap_table_size;
 
757
  hp_create_info.max_table_size=current_session->variables.max_heap_table_size;
758
758
  hp_create_info.with_auto_increment= found_real_auto_increment;
759
759
  hp_create_info.internal_table= internal_table;
760
760
  hp_create_info.max_chunk_size= share->block_size;