← 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-07-07 16:58:11 UTC
  • mfrom: (77.1.25 codestyle)
  • Revision ID: brian@tangent.org-20080707165811-jfqxacc3436dut4n
Merge from Monty's tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/ha_heap.cc
28
28
                                    TABLE_SHARE *table, 
29
29
                                    MEM_ROOT *mem_root);
30
30
 
31
 
int heap_panic(handlerton *hton, ha_panic_function flag)
 
31
int heap_panic(handlerton *hton __attribute__((__unused__)),
 
32
               ha_panic_function flag)
32
33
{
33
34
  return hp_panic(flag);
34
35
}
361
362
  return error;
362
363
}
363
364
 
364
 
void ha_heap::position(const uchar *record)
 
365
void ha_heap::position(const uchar *record __attribute__((__unused__)))
365
366
{
366
367
  *(HEAP_PTR*) ref= heap_position(file);        // Ref is aligned
367
368
}
418
419
  return 0;
419
420
}
420
421
 
421
 
int ha_heap::external_lock(THD *thd, int lock_type)
 
422
int ha_heap::external_lock(THD *thd __attribute__((__unused__)),
 
423
                           int lock_type __attribute__((__unused__)))
422
424
{
423
425
  return 0;                                     // No external locking
424
426
}
531
533
  return heap_indexes_are_disabled(file);
532
534
}
533
535
 
534
 
THR_LOCK_DATA **ha_heap::store_lock(THD *thd,
535
 
                                    THR_LOCK_DATA **to,
536
 
                                    enum thr_lock_type lock_type)
 
536
THR_LOCK_DATA **ha_heap::store_lock(THD *thd __attribute__((__unused__)),
 
537
                                    THR_LOCK_DATA **to,
 
538
                                    enum thr_lock_type lock_type)
537
539
{
538
540
  if (lock_type != TL_IGNORE && file->lock.type == TL_UNLOCK)
539
541
    file->lock.type=lock_type;
553
555
}
554
556
 
555
557
 
556
 
void ha_heap::drop_table(const char *name)
 
558
void ha_heap::drop_table(const char *name __attribute__((__unused__)))
557
559
{
558
560
  file->s->delete_on_close= 1;
559
561
  close();
715
717
    create_info->auto_increment_value= stats.auto_increment_value;
716
718
}
717
719
 
718
 
void ha_heap::get_auto_increment(uint64_t offset, uint64_t increment,
719
 
                                 uint64_t nb_desired_values,
 
720
void ha_heap::get_auto_increment(uint64_t offset __attribute__((__unused__)),
 
721
                                 uint64_t increment __attribute__((__unused__)),
 
722
                                 uint64_t nb_desired_values __attribute__((__unused__)),
720
723
                                 uint64_t *first_value,
721
724
                                 uint64_t *nb_reserved_values)
722
725
{