← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/opt_sum.cc

  • Committer: Brian Aker
  • Date: 2008-07-10 19:37:55 UTC
  • mfrom: (51.1.67 remove-dbug)
  • Revision ID: brian@tangent.org-20080710193755-f5g761uieqa3wxmt
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/opt_sum.cc
115
115
  int const_result= 1;
116
116
  bool recalc_const_item= 0;
117
117
  ulonglong count= 1;
118
 
  bool is_exact_count= TRUE, maybe_exact_count= TRUE;
 
118
  bool is_exact_count= TRUE, maybe_exact_count= true;
119
119
  table_map removed_tables= 0, outer_tables= 0, used_tables= 0;
120
120
  table_map where_tables= 0;
121
121
  Item *item;
166
166
      maybe_exact_count&= test(!tl->schema_table &&
167
167
                               (tl->table->file->ha_table_flags() &
168
168
                                HA_HAS_RECORDS));
169
 
      is_exact_count= FALSE;
 
169
      is_exact_count= false;
170
170
      count= 1;                                 // ensure count != 0
171
171
    }
172
172
    else
312
312
                  (error == HA_ERR_KEY_NOT_FOUND ||
313
313
                   key_cmp_if_same(table, ref.key_buff, ref.key, prefix_len)))
314
314
              {
315
 
                DBUG_ASSERT(item_field->field->real_maybe_null());
 
315
                assert(item_field->field->real_maybe_null());
316
316
                error= table->file->index_read_map(table->record[0],
317
317
                                                   ref.key_buff,
318
318
                                                   make_prev_keypart_map(ref.key_parts),
864
864
            ref->key_buff[ref->key_length]= 1;
865
865
            ref->key_length+= part->store_length;
866
866
            ref->key_parts++;
867
 
            DBUG_ASSERT(ref->key_parts == jdx+1);
 
867
            assert(ref->key_parts == jdx+1);
868
868
            *range_fl&= ~NO_MIN_RANGE;
869
869
            *range_fl|= NEAR_MIN; // Open interval
870
870
          }
971
971
  case Item_func::EQUAL_FUNC:
972
972
    break;
973
973
  default:                                        // Keep compiler happy
974
 
    DBUG_ASSERT(1);                               // Impossible
 
974
    assert(1);                               // Impossible
975
975
    break;
976
976
  }
977
977
  return 0;