← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2011-03-08 06:21:17 UTC
  • mfrom: (2223.1.3 build)
  • Revision ID: mordred@inaugust.com-20110308062117-4i2syq1gqtmcmcyk
Merge Olaf - XID and Dynamic_array refactoring
Merge Andrew - Optimizer bugs

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
67
67
#include <drizzled/sort_field.h>
68
68
#include <drizzled/select_result.h>
69
69
#include <drizzled/key.h>
 
70
#include <drizzled/my_hash.h>
70
71
 
71
72
using namespace std;
72
73
 
682
683
        save_pos++;
683
684
      }
684
685
      i= (uint32_t) (save_pos - (optimizer::KeyUse*) keyuse->buffer);
685
 
      set_dynamic(keyuse, (unsigned char*) &key_end, i);
686
 
      keyuse->elements= i;
 
686
      reinterpret_cast<optimizer::KeyUse*>(keyuse->buffer)[i] = key_end;
 
687
      keyuse->set_size(i);
687
688
    }
688
689
  }
689
690
  return false;