← Back to branch summary

~shubhamsomani92/drizzle/trunk-bug-995739

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rnext.cc

  • Committer: Continuous Integration
  • Date: 2013-03-07 03:15:07 UTC
  • mfrom: (2630.1.7 create-tmp-table)
  • Revision ID: ci@drizzle.org-20130307031507-bqgrashrp5m3fw8x
Merge lp:~stewart/drizzle/misc-cleanups Build: jenkins-Drizzle-Builder-175

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rnext.cc
14
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
16
#include "myisam_priv.h"
 
17
#include <drizzled/message/table.h>
17
18
 
18
19
using namespace drizzled;
19
20
 
41
42
  if (!flag)
42
43
  {
43
44
    switch(info->s->keyinfo[inx].key_alg){
44
 
    case HA_KEY_ALG_BTREE:
 
45
    case message::Table::Index::BTREE:
45
46
    default:
46
47
      error=_mi_search_first(info,info->s->keyinfo+inx,
47
48
                           info->s->state.key_root[inx]);
51
52
  else
52
53
  {
53
54
    switch (info->s->keyinfo[inx].key_alg) {
54
 
    case HA_KEY_ALG_BTREE:
 
55
    case message::Table::Index::BTREE:
55
56
    default:
56
57
      if (!changed)
57
58
        error= _mi_search_next(info,info->s->keyinfo+inx,info->lastkey,