← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty
  • Date: 2008-10-02 05:41:33 UTC
  • mfrom: (398.1.10 codestyle)
  • Revision ID: mordred@scylla.inaugust.com-20081002054133-tyxv5bmqpazfaqqi
Merged up to 408 of stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
1924
1924
{
1925
1925
  unit->offset_limit_cnt= (ha_rows)(select_lex->offset_limit ?
1926
1926
                                    select_lex->offset_limit->val_uint() :
1927
 
                                    0ULL);
 
1927
                                    0UL);
1928
1928
 
1929
1929
  first_record= 0;
1930
1930
 
4444
4444
          keyuse.null_rejecting= key_field->null_rejecting;
4445
4445
          keyuse.cond_guard= key_field->cond_guard;
4446
4446
          keyuse.sj_pred_no= key_field->sj_pred_no;
4447
 
          VOID(insert_dynamic(keyuse_array,(uchar*) &keyuse));
 
4447
          insert_dynamic(keyuse_array,(uchar*) &keyuse);
4448
4448
        }
4449
4449
      }
4450
4450
    }
4673
4673
          (qsort_cmp) sort_keyuse);
4674
4674
 
4675
4675
    memset(&key_end, 0, sizeof(key_end)); /* Add for easy testing */
4676
 
    VOID(insert_dynamic(keyuse,(uchar*) &key_end));
 
4676
    insert_dynamic(keyuse,(uchar*) &key_end);
4677
4677
 
4678
4678
    use=save_pos=dynamic_element(keyuse,0,KEYUSE*);
4679
4679
    prev= &key_end;
4706
4706
      save_pos++;
4707
4707
    }
4708
4708
    i=(uint) (save_pos-(KEYUSE*) keyuse->buffer);
4709
 
    VOID(set_dynamic(keyuse,(uchar*) &key_end,i));
 
4709
    set_dynamic(keyuse,(uchar*) &key_end,i);
4710
4710
    keyuse->elements=i;
4711
4711
  }
4712
4712
  return false;
4877
4877
    */
4878
4878
    if (!(item->used_tables() & remaining_tables))
4879
4879
    {
4880
 
      res |= 1ULL < i;
 
4880
      res |= 1UL < i;
4881
4881
    }
4882
4882
  }
4883
4883
  return res;
5018
5018
          if (try_sj_inside_out && keyuse->sj_pred_no != UINT_MAX)
5019
5019
          {
5020
5020
            if (!(remaining_tables & keyuse->used_tables))
5021
 
              bound_sj_equalities |= 1ULL << keyuse->sj_pred_no;
 
5021
              bound_sj_equalities |= 1UL << keyuse->sj_pred_no;
5022
5022
            else
5023
5023
            {
5024
 
              handled_sj_equalities |= 1ULL << keyuse->sj_pred_no;
 
5024
              handled_sj_equalities |= 1UL << keyuse->sj_pred_no;
5025
5025
              sj_insideout_map |= ((key_part_map)1) << keyuse->keypart;
5026
5026
            }
5027
5027
          }
10268
10268
        li.remove();
10269
10269
      else if (item != new_item)
10270
10270
      {
10271
 
        VOID(li.replace(new_item));
 
10271
        li.replace(new_item);
10272
10272
        should_fix_fields=1;
10273
10273
      }
10274
10274
      if (*cond_value == Item::COND_UNDEF)
10593
10593
 
10594
10594
  if (table)
10595
10595
  {
10596
 
    VOID(table->file->extra(HA_EXTRA_WRITE_CACHE));
 
10596
    table->file->extra(HA_EXTRA_WRITE_CACHE);
10597
10597
    empty_record(table);
10598
10598
    if (table->group && join->tmp_table_param.sum_func_count &&
10599
10599
        table->s->keys && !table->file->inited)
12006
12006
      if (end_of_records)
12007
12007
        return(NESTED_LOOP_OK);
12008
12008
      join->first_record=1;
12009
 
      VOID(test_if_item_cache_changed(join->group_fields));
 
12009
      test_if_item_cache_changed(join->group_fields);
12010
12010
    }
12011
12011
    if (idx < (int) join->send_group_parts)
12012
12012
    {
12264
12264
      if (end_of_records)
12265
12265
        return(NESTED_LOOP_OK);
12266
12266
      join->first_record=1;
12267
 
      VOID(test_if_item_cache_changed(join->group_fields));
 
12267
      test_if_item_cache_changed(join->group_fields);
12268
12268
    }
12269
12269
    if (idx < (int) join->send_group_parts)
12270
12270
    {