diff options
| author | unknown <serg@serg.mylan> | 2004-06-25 21:43:02 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-25 21:43:02 +0200 |
| commit | 00567fe6342fc6cc60df0244ac5b0eeb1e792981 (patch) | |
| tree | 3793f5cd3c67c9920e6eb21c2eabba3f633952a2 /sql/opt_range.cc | |
| parent | b4336ad4e0478f6e5a05ef66ebe68a66deafbbe6 (diff) | |
| download | mariadb-git-00567fe6342fc6cc60df0244ac5b0eeb1e792981.tar.gz | |
release cursors in return_zero_rows
sql/opt_range.cc:
incorrect fix removed. range optimizer is made slightly more stable vs. compiler optimizations
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 5 |
1 files changed, 1 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) { |