~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_rprev.c

  • Committer: Monty Taylor
  • Date: 2009-03-03 08:32:10 UTC
  • mfrom: (909 drizzle)
  • mto: This revision was merged to the branch mainline in revision 910.
  • Revision ID: mordred@inaugust.com-20090303083210-3cnjr53jspruighy
Merged trunk.

Show diffs side-by-side

added added

removed removed

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