← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_create.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_create.cc
19
19
#include <drizzled/error.h>
20
20
 
21
21
#include <string.h>
 
22
#include <algorithm>
 
23
 
 
24
using namespace std;
22
25
 
23
26
static int keys_compare(heap_rb_param *param, unsigned char *key1, unsigned char *key2);
24
27
static void init_block(HP_BLOCK *block,uint32_t chunk_length, uint32_t min_records,
397
400
{
398
401
  uint32_t i,recbuffer,records_in_block;
399
402
 
400
 
  max_records= cmax(min_records,max_records);
 
403
  max_records= max(min_records,max_records);
401
404
  if (!max_records)
402
405
    max_records= 1000;                  /* As good as quess as anything */
403
406