summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authoringo@mysql.com <>2005-01-26 09:09:53 +0100
committeringo@mysql.com <>2005-01-26 09:09:53 +0100
commit5ea224b824cea9876d0181a761c6508590883116 (patch)
treecc9d5f787c313a01d2500fe808fdef2bcf84b36e /sql/sql_select.cc
parent88c434a905da38190dc574310d44316af06b596f (diff)
parent7084b494c44eb2d815652640381c8930981dc435 (diff)
downloadmariadb-git-5ea224b824cea9876d0181a761c6508590883116.tar.gz
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5cb6a0a65df..ccfcb213068 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2844,16 +2844,9 @@ 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;
else if (rec_per_key/(double) s->records >= 0.01)