← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_rprev.cc

  • Committer: Brian Aker
  • Date: 2009-03-22 21:27:04 UTC
  • mfrom: (960.2.22 mordred)
  • Revision ID: brian@tangent.org-20090322212704-ysn4mkkjg2u9kv22
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_rprev.cc
34
34
    heap_rb_param custom_arg;
35
35
 
36
36
    if (info->last_pos)
37
 
      pos = tree_search_next(&keyinfo->rb_tree, &info->last_pos,
38
 
                             offsetof(TREE_ELEMENT, right),
39
 
                             offsetof(TREE_ELEMENT, left));
 
37
      pos = (unsigned char *)tree_search_next(&keyinfo->rb_tree,
 
38
                                              &info->last_pos,
 
39
                                              offsetof(TREE_ELEMENT, right),
 
40
                                              offsetof(TREE_ELEMENT, left));
40
41
    else
41
42
    {
42
43
      custom_arg.keyseg = keyinfo->seg;
43
44
      custom_arg.key_length = keyinfo->length;
44
45
      custom_arg.search_flag = SEARCH_SAME;
45
 
      pos = tree_search_key(&keyinfo->rb_tree, info->lastkey, info->parents,
46
 
                           &info->last_pos, info->last_find_flag, &custom_arg);
 
46
      pos = (unsigned char *)tree_search_key(&keyinfo->rb_tree,
 
47
                                             info->lastkey, info->parents,
 
48
                                             &info->last_pos,
 
49
                                             info->last_find_flag,
 
50
                                             &custom_arg);
47
51
    }
48
52
    if (pos)
49
53
    {