diff options
| author | ingo@mysql.com <> | 2005-01-24 10:48:52 +0100 |
|---|---|---|
| committer | ingo@mysql.com <> | 2005-01-24 10:48:52 +0100 |
| commit | c4a0eb142b36ccb492309c7ee2ebb143a1571f7f (patch) | |
| tree | 4a89fa584fd149ed4a310e3398a8cea3f47258db /sql/sql_select.cc | |
| parent | 12879fc30d4d3e9fd664c832ee618a2a15b58c9b (diff) | |
| parent | 0a59f6aad012a1fd95fca7f7bc007ce0e1a83b62 (diff) | |
| download | mariadb-git-c4a0eb142b36ccb492309c7ee2ebb143a1571f7f.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
Diffstat (limited to 'sql/sql_select.cc')
| -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 0fc4616749c..801b9d5d021 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4474,9 +4474,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; @@ -10766,13 +10772,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->unit->select_limit_cnt= 1; // Only send first row DBUG_RETURN(0); } Field **first_field=entry->field+entry->s->fields - field_count; - offset=entry->field[entry->s->fields - field_count]->offset(); + offset= field_count ? + entry->field[entry->s->fields - field_count]->offset() : 0; reclength=entry->s->reclength-offset; free_io_cache(entry); // Safety |