diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-12 23:42:36 +0200 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-12 23:42:36 +0200 |
| commit | de34385a565a07536f314813e02f63aec1d0f369 (patch) | |
| tree | 59d9e31c78caca8be26a8746fa5e83ac54aabb1a /sql/sql_select.cc | |
| parent | 0f6e518a3ba975d84ef192ee295bf330368855b3 (diff) | |
| parent | 3d501aece0f68183d0a74aa37d0938ccd91733ac (diff) | |
| download | mariadb-git-clone-5.0.42-build.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0clone-5.0.42-build
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3a480c01ac1..967322600a7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4189,7 +4189,7 @@ best_access_path(JOIN *join, !(s->quick && best_key && s->quick->index == best_key->key && // (2) best_max_key_part >= s->table->quick_key_parts[best_key->key]) &&// (2) !((s->table->file->table_flags() & HA_TABLE_SCAN_ON_INDEX) && // (3) - ! s->table->used_keys.is_clear_all() && best_key) && // (3) + ! s->table->used_keys.is_clear_all() && best_key && !s->quick) &&// (3) !(s->table->force_index && best_key && !s->quick)) // (4) { // Check full join ha_rows rnd_records= s->found_records; |