← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_rnext.cc

  • Committer: Brian Aker
  • Date: 2010-08-13 00:46:27 UTC
  • mto: (1711.1.17 build)
  • mto: This revision was merged to the branch mainline in revision 1710.
  • Revision ID: brian@tangent.org-20100813004627-zztrtq1j1r7zsm3w
Switch to using vector.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_rnext.cc
76
76
      custom_arg.key_length = info->lastkey_len;
77
77
      custom_arg.search_flag = SEARCH_SAME | SEARCH_FIND;
78
78
      pos = (unsigned char *)tree_search_key(&keyinfo->rb_tree,
79
 
                                             info->lastkey, info->parents,
 
79
                                             &info->lastkey[0], info->parents,
80
80
                                             &info->last_pos,
81
81
                                             info->last_find_flag,
82
82
                                             &custom_arg);
95
95
  else
96
96
  {
97
97
    if (info->current_hash_ptr)
98
 
      pos= hp_search_next(info, keyinfo, info->lastkey,
 
98
      pos= hp_search_next(info, keyinfo, &info->lastkey[0],
99
99
                           info->current_hash_ptr);
100
100
    else
101
101
    {
105
105
        errno=HA_ERR_KEY_NOT_FOUND;
106
106
      }
107
107
      else if (!info->current_ptr)              /* Deleted or first call */
108
 
        pos= hp_search(info, keyinfo, info->lastkey, 0);
 
108
        pos= hp_search(info, keyinfo, &info->lastkey[0], 0);
109
109
      else
110
 
        pos= hp_search(info, keyinfo, info->lastkey, 1);
 
110
        pos= hp_search(info, keyinfo, &info->lastkey[0], 1);
111
111
    }
112
112
  }
113
113
  if (!pos)