diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-07 11:25:47 +0200 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-07 11:25:47 +0200 |
| commit | ab013df0806c83bf36d1ae4d4503ce8ff2caad84 (patch) | |
| tree | ca9a1a82215627b05504ef9b583eb2a3925fe1fa /sql/opt_range.cc | |
| parent | d4025ce1a60322635bf5f7adb765f4612563ee3a (diff) | |
| parent | b806eea262123165cd1209a58d8a9177d4bac3ed (diff) | |
| download | mariadb-git-ab013df0806c83bf36d1ae4d4503ce8ff2caad84.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index b8bdb604eea..a1ad097f12c 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2142,9 +2142,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, quick=0; needed_reg.clear_all(); quick_keys.clear_all(); - if ((specialflag & SPECIAL_SAFE_MODE) && ! force_quick_range || - !limit) - DBUG_RETURN(0); /* purecov: inspected */ if (keys_to_use.is_clear_all()) DBUG_RETURN(0); records= head->file->stats.records; @@ -4315,7 +4312,6 @@ static bool ror_intersect_add(ROR_INTERSECT_INFO *info, } info->out_rows *= selectivity_mult; - DBUG_PRINT("info", ("info->total_cost= %g", info->total_cost)); if (is_cpk_scan) { |