← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rnext.c

Merging trunk changes from over weekend.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_rnext.c
15
15
 
16
16
#include "myisamdef.h"
17
17
 
18
 
#include "rt_index.h"
19
 
 
20
18
        /*
21
19
           Read next row with the same key as previous read
22
20
           One may have done a write, update or delete of the previous row.
45
43
  if (!flag)
46
44
  {
47
45
    switch(info->s->keyinfo[inx].key_alg){
48
 
#ifdef HAVE_RTREE_KEYS
49
 
    case HA_KEY_ALG_RTREE:
50
 
      error=rtree_get_first(info,inx,info->lastkey_length);
51
 
      break;
52
 
#endif
53
46
    case HA_KEY_ALG_BTREE:
54
47
    default:
55
48
      error=_mi_search_first(info,info->s->keyinfo+inx,
60
53
  else
61
54
  {
62
55
    switch (info->s->keyinfo[inx].key_alg) {
63
 
#ifdef HAVE_RTREE_KEYS
64
 
    case HA_KEY_ALG_RTREE:
65
 
      /*
66
 
        Note that rtree doesn't support that the table
67
 
        may be changed since last call, so we do need
68
 
        to skip rows inserted by other threads like in btree
69
 
      */
70
 
      error= rtree_get_next(info,inx,info->lastkey_length);
71
 
      break;
72
 
#endif
73
56
    case HA_KEY_ALG_BTREE:
74
57
    default:
75
58
      if (!changed)