diff options
| author | unknown <ingo@mysql.com> | 2005-01-24 10:08:45 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-01-24 10:08:45 +0100 |
| commit | d7d7741e5b2e7353859aa793e27aaa43df344257 (patch) | |
| tree | 6c30b5eff9164c5c0426160ca710e8f83c475a04 /sql | |
| parent | 4095dbb9739f6aa1bfafb61a24ad8889b16bfdfd (diff) | |
| parent | 25c2d1adb09a3dd521a110013ab03eac3e1fc01a (diff) | |
| download | mariadb-git-d7d7741e5b2e7353859aa793e27aaa43df344257.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0d7ee1eb125..8dcae9a24b7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2138,9 +2138,15 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count, x = used key parts (1 <= x <= c) */ double rec_per_key; +#if 0 if (!(rec_per_key=(double) keyinfo->rec_per_key[keyinfo->key_parts-1])) rec_per_key=(double) s->records/rec+1; +#else + rec_per_key= keyinfo->rec_per_key[keyinfo->key_parts-1] ? + (double) keyinfo->rec_per_key[keyinfo->key_parts-1] : + (double) s->records/rec+1; +#endif if (!s->records) tmp=0; @@ -6300,13 +6306,14 @@ remove_duplicates(JOIN *join, TABLE *entry,List<Item> &fields, Item *having) field_count++; } - if (!field_count) - { // only const items + if (!field_count && !(join->select_options & OPTION_FOUND_ROWS)) + { // only const items with no OPTION_FOUND_ROWS join->thd->select_limit=1; // Only send first row DBUG_RETURN(0); } Field **first_field=entry->field+entry->fields - field_count; - offset=entry->field[entry->fields - field_count]->offset(); + offset= field_count ? + entry->field[entry->fields - field_count]->offset() : 0; reclength=entry->reclength-offset; free_io_cache(entry); // Safety |