← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/my_handler.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/my_handler.cc
24
24
#include <plugin/myisam/my_handler.h>
25
25
#include <mysys/my_sys.h>
26
26
 
 
27
#include <algorithm>
 
28
 
 
29
using namespace std;
 
30
 
27
31
/**
28
32
  Swap the contents of two variables.
29
33
 */
53
57
static int compare_bin(unsigned char *a, uint32_t a_length, unsigned char *b, uint32_t b_length,
54
58
                       bool part_key, bool skip_end_space)
55
59
{
56
 
  uint32_t length= cmin(a_length,b_length);
 
60
  uint32_t length= min(a_length,b_length);
57
61
  unsigned char *end= a+ length;
58
62
  int flag;
59
63
 
181
185
        continue;                               /* To next key part */
182
186
      }
183
187
    }
184
 
    end= a+ cmin(keyseg->length,key_length);
 
188
    end= a+ min((uint32_t)keyseg->length,key_length);
185
189
    next_key_length=key_length-keyseg->length;
186
190
 
187
191
    switch ((enum ha_base_keytype) keyseg->type) {