← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unique.h

  • Committer: Lee Bieber
  • Date: 2010-10-30 02:15:22 UTC
  • mfrom: (1891.2.1 clang)
  • mto: This revision was merged to the branch mainline in revision 1893.
  • Revision ID: kalebral@gmail.com-20101030021522-tel18euhugpao68b
Merge Monty - Fix a bunch of warnings and errors from clang build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unique.h
60
60
  static double get_use_cost(uint32_t *buffer, uint32_t nkeys, uint32_t key_size,
61
61
                             size_t max_in_memory_size);
62
62
  inline static int get_cost_calc_buff_size(ulong nkeys, uint32_t key_size,
63
 
                                            size_t max_in_memory_size)
 
63
                                            size_t sortbuff_size)
64
64
  {
65
65
    register size_t max_elems_in_tree=
66
 
      (1 + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));
 
66
      (1 + sortbuff_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));
67
67
    return (int) (sizeof(uint32_t)*(1 + nkeys/max_elems_in_tree));
68
68
  }
69
69