diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-31 16:17:24 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-31 16:17:24 -0700 |
| commit | 552656c3ba5e3604fabc656f8b7dec805febb91b (patch) | |
| tree | ecfec25ec880212bd112f7b24ddd98598dc874bb /sql/opt_sum.cc | |
| parent | 8612588aeb74cc1a3252206da9c14cd83f392b4e (diff) | |
| download | mariadb-git-552656c3ba5e3604fabc656f8b7dec805febb91b.tar.gz | |
fixed wrong DBUG_ASSERT() in IO_CACHE
fixed apparent typo in opt_sum.cc
I will push this Changeset although it fails select test - failing select
is better than the code that does not compile.
mysql-test/r/rpl000001.result:
updated result
mysys/mf_iocache2.c:
fixed wrong DBUG_ASSERT()
sql/opt_sum.cc:
fixed an apparent typo to make it compile
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 31611798064..78878c40b37 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -299,7 +299,7 @@ static bool find_range_key(TABLE_REF *ref, Field* field, COND *cond) uint idx=0; /* Check if some key has field as first key part */ - if ((field->key_start & field->table->keys_in_use_for_query) &&A + if ((field->key_start & field->table->keys_in_use_for_query) && (! cond || ! (cond->used_tables() & table->map))) { for (key_map key=field->key_start ; !(key & 1) ; idx++) |