← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_create.cc

  • Committer: Monty Taylor
  • Date: 2010-02-04 08:14:46 UTC
  • mfrom: (1277.2.1 build) (1280.2.1 build)
  • mto: This revision was merged to the branch mainline in revision 1283.
  • Revision ID: mordred@inaugust.com-20100204081446-ldh9m486va30uap6
Put everything in drizzled into drizzled namespace.
Put internal stuff into drizzled::internal namespace.
Removed some cruft.
Now every symbol that is shipped in a header is in the drizzled namespace
and everything in the server that's not shipped is labeled internal. woot. 
Removed a lot of the extra extern "C" stuff that was in there. Less ugliness for
internal callbacks now for Sun Studio.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_create.cc
23
23
#include <algorithm>
24
24
 
25
25
using namespace std;
 
26
using namespace drizzled;
26
27
 
27
28
static int keys_compare(heap_rb_param *param, unsigned char *key1, unsigned char *key2);
28
29
static void init_block(HP_BLOCK *block,uint32_t chunk_length, uint32_t min_records,
406
407
  if (records_in_block < 10 && max_records)
407
408
    records_in_block= 10;
408
409
  if (!records_in_block || records_in_block*recbuffer >
409
 
      (my_default_record_cache_size-sizeof(HP_PTRS)*HP_MAX_LEVELS))
410
 
    records_in_block= (my_default_record_cache_size - sizeof(HP_PTRS) *
 
410
      (internal::my_default_record_cache_size-sizeof(HP_PTRS)*HP_MAX_LEVELS))
 
411
    records_in_block= (internal::my_default_record_cache_size - sizeof(HP_PTRS) *
411
412
                      HP_MAX_LEVELS) / recbuffer + 1;
412
413
  block->records_in_block= records_in_block;
413
414
  block->recbuffer= recbuffer;