mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Cleanups during review
BitKeeper/etc/ignore: added libmysqld/examples/mysqltest_embedded client/mysqlbinlog.cc: Call mysql_close() before die() innobase/include/eval0eval.ic: Remove assert that fails on 64 bit machines (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU) sql/mysqld.cc: Force lower_case_table_names to 0 if set to 2 on case insensitive file name sql/sql_select.cc: Remove #if 0
This commit is contained in:
@@ -2828,16 +2828,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)
|
||||
|
||||
Reference in New Issue
Block a user