← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sum.cc

  • Committer: Joe Daly
  • Date: 2010-06-06 18:08:00 UTC
  • mto: This revision was merged to the branch mainline in revision 1614.
  • Revision ID: skinny.moey@gmail.com-20100606180800-414svjbgxc9wz1z3
fix compiler warning (hopefully) change lu to PRIu64

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sum.cc
135
135
  for (TableList *tl= tables; tl; tl= tl->next_leaf)
136
136
  {
137
137
    TableList *embedded= NULL;
138
 
    for (embedded= tl; embedded; embedded= embedded->getEmbedding())
 
138
    for (embedded= tl; embedded; embedded= embedded->embedding)
139
139
    {
140
140
      if (embedded->on_expr)
141
141
        break;
239
239
 
240
240
              ref.key_buff= key_buff;
241
241
              Item_field *item_field= (Item_field*) (expr->real_item());
242
 
              Table *table= item_field->field->getTable();
 
242
              Table *table= item_field->field->table;
243
243
 
244
244
              /*
245
245
                 Look for a partial key that can be used for optimization.
407
407
 
408
408
              ref.key_buff= key_buff;
409
409
              Item_field *item_field= (Item_field*) (expr->real_item());
410
 
              Table *table= item_field->field->getTable();
 
410
              Table *table= item_field->field->table;
411
411
 
412
412
              /*
413
413
                 Look for a partial key that can be used for optimization.
662
662
 
663
663
  field->setWriteSet();
664
664
 
665
 
  if (! (cond->used_tables() & field->getTable()->map))
 
665
  if (! (cond->used_tables() & field->table->map))
666
666
  {
667
667
    /* Condition doesn't restrict the used table */
668
668
    return 1;
907
907
    return 0; // Not key field
908
908
  }
909
909
 
910
 
  Table *table= field->getTable();
 
910
  Table *table= field->table;
911
911
  uint32_t idx= 0;
912
912
 
913
913
  KeyInfo *keyinfo,*keyinfo_end= NULL;
914
 
  for (keyinfo= table->key_info, keyinfo_end= keyinfo+table->getShare()->sizeKeys();
 
914
  for (keyinfo= table->key_info, keyinfo_end= keyinfo+table->getShare()->keys;
915
915
       keyinfo != keyinfo_end;
916
916
       keyinfo++,idx++)
917
917
  {
938
938
      }
939
939
 
940
940
      /* Check whether the index component is partial */
941
 
      Field *part_field= table->getField(part->fieldnr-1);
 
941
      Field *part_field= table->field[part->fieldnr-1];
942
942
      part_field->setWriteSet();
943
943
 
944
944
      if ((part_field->flags & BLOB_FLAG) ||
1028
1028
                           uint32_t range_fl,
1029
1029
                           uint32_t prefix_len)
1030
1030
{
1031
 
  if (key_cmp_if_same(field->getTable(), ref->key_buff, ref->key, prefix_len))
 
1031
  if (key_cmp_if_same(field->table, ref->key_buff, ref->key, prefix_len))
1032
1032
  {
1033
1033
    return 1;
1034
1034
  }
1069
1069
    return 0;
1070
1070
  }
1071
1071
 
1072
 
  if (cond->used_tables() != field->getTable()->map)
 
1072
  if (cond->used_tables() != field->table->map)
1073
1073
  {
1074
1074
    return 0;
1075
1075
  }