← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/ha_heap.cc

Moved m_ctype, m_string and my_bitmap. Removed t_ctype.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/ha_heap.cc
20
20
 
21
21
#define MYSQL_SERVER 1
22
22
#include "mysql_priv.h"
23
 
#include <mysql/plugin.h>
24
23
#include "ha_heap.h"
25
24
#include "heapdef.h"
26
25
 
28
27
                                    TABLE_SHARE *table, 
29
28
                                    MEM_ROOT *mem_root);
30
29
 
31
 
int heap_panic(handlerton *hton __attribute__((__unused__)),
 
30
int heap_panic(handlerton *hton __attribute__((unused)),
32
31
               ha_panic_function flag)
33
32
{
34
33
  return hp_panic(flag);
362
361
  return error;
363
362
}
364
363
 
365
 
void ha_heap::position(const uchar *record __attribute__((__unused__)))
 
364
void ha_heap::position(const uchar *record __attribute__((unused)))
366
365
{
367
366
  *(HEAP_PTR*) ref= heap_position(file);        // Ref is aligned
368
367
}
419
418
  return 0;
420
419
}
421
420
 
422
 
int ha_heap::external_lock(THD *thd __attribute__((__unused__)),
423
 
                           int lock_type __attribute__((__unused__)))
 
421
int ha_heap::external_lock(THD *thd __attribute__((unused)),
 
422
                           int lock_type __attribute__((unused)))
424
423
{
425
424
  return 0;                                     // No external locking
426
425
}
533
532
  return heap_indexes_are_disabled(file);
534
533
}
535
534
 
536
 
THR_LOCK_DATA **ha_heap::store_lock(THD *thd __attribute__((__unused__)),
 
535
THR_LOCK_DATA **ha_heap::store_lock(THD *thd __attribute__((unused)),
537
536
                                    THR_LOCK_DATA **to,
538
537
                                    enum thr_lock_type lock_type)
539
538
{
555
554
}
556
555
 
557
556
 
558
 
void ha_heap::drop_table(const char *name __attribute__((__unused__)))
 
557
void ha_heap::drop_table(const char *name __attribute__((unused)))
559
558
{
560
559
  file->s->delete_on_close= 1;
561
560
  close();
717
716
    create_info->auto_increment_value= stats.auto_increment_value;
718
717
}
719
718
 
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__)),
 
719
void ha_heap::get_auto_increment(uint64_t offset __attribute__((unused)),
 
720
                                 uint64_t increment __attribute__((unused)),
 
721
                                 uint64_t nb_desired_values __attribute__((unused)),
723
722
                                 uint64_t *first_value,
724
723
                                 uint64_t *nb_reserved_values)
725
724
{