diff options
| author | unknown <monty@mysql.com> | 2004-06-25 21:56:23 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-25 21:56:23 +0300 |
| commit | ba8ffc50a96897f85f32c01485d44730b9deb383 (patch) | |
| tree | 06dc93aec118ef2da622d0ade5ab9cf7f4664b88 /sql/opt_range.cc | |
| parent | c6e23c85493688417c0274b4630a6b7c44f59d10 (diff) | |
| download | mariadb-git-ba8ffc50a96897f85f32c01485d44730b9deb383.tar.gz | |
After merge fixes
include/mysql.h:
Cleanup
sql-common/client.c:
Allow client.c to compile after changes to mysql.h
sql/opt_range.cc:
Make bdb.test repeatable (and assume that table scans is a little bit slower)
sql/sql_handler.cc:
Fixed typo during merge
sql/sql_insert.cc:
Fixed indentation
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index e3a9ba4d01d..08856c88c49 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.1; if (head->force_index) scan_time= read_time= DBL_MAX; if (limit < records) @@ -749,6 +749,8 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, param.range_count, found_records)+ (double) found_records / TIME_FOR_COMPARE); + DBUG_PRINT("info",("read_time: %g found_read_time: %g", + read_time, found_read_time)); if (read_time > found_read_time && found_records != HA_POS_ERROR) { read_time=found_read_time; |