← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
3784
3784
  /* Ok got a tuple */
3785
3785
  RANGE_SEQ_ENTRY *cur= &seq->stack[seq->i];
3786
3786
 
3787
 
  range->ptr= (char*)(int)(key_tree->part);
 
3787
  range->ptr= (char*)(size_t)(key_tree->part);
3788
3788
  {
3789
3789
    range->range_flag= cur->min_key_flag | cur->max_key_flag;
3790
3790