diff options
| -rw-r--r-- | sql/opt_range.cc | 5 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index e3a9ba4d01d..dce9618c9ee 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -629,7 +629,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, if (!records) records++; /* purecov: inspected */ scan_time=(double) records / TIME_FOR_COMPARE+1; - read_time=(double) head->file->scan_time()+ scan_time + 1.0; + read_time=(double) head->file->scan_time()+ scan_time + 1.01; if (head->force_index) scan_time= read_time= DBL_MAX; if (limit < records) @@ -716,9 +716,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, key++,idx++) { ha_rows found_records; -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 95) && defined(__OPTIMIZE__) - volatile // gcc 2.95.3 bug in -O3 mode -#endif double found_read_time; if (*key) { diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d8662af1d39..528ff2065a2 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4128,6 +4128,8 @@ return_zero_rows(JOIN *join, select_result *result,TABLE_LIST *tables, DBUG_RETURN(0); } + join->join_free(0); + if (send_row) { for (TABLE_LIST *table=tables; table ; table=table->next) |