← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rkey.c

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_rkey.c
16
16
/* Read record based on a key */
17
17
 
18
18
#include "myisamdef.h"
19
 
#include "rt_index.h"
20
19
 
21
20
        /* Read a record using key */
22
21
        /* Ordinary search_flag is 0 ; Give error if no record with key */
81
80
    use_key_length=USE_WHOLE_KEY;
82
81
 
83
82
  switch (info->s->keyinfo[inx].key_alg) {
84
 
#ifdef HAVE_RTREE_KEYS
85
 
  case HA_KEY_ALG_RTREE:
86
 
    if (rtree_find_first(info,inx,key_buff,use_key_length,nextflag) < 0)
87
 
    {
88
 
      mi_print_error(info->s, HA_ERR_CRASHED);
89
 
      my_errno=HA_ERR_CRASHED;
90
 
      goto err;
91
 
    }
92
 
    break;
93
 
#endif
94
83
  case HA_KEY_ALG_BTREE:
95
84
  default:
96
85
    myisam_search_flag= myisam_read_vec[search_flag];