← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/uniques.cc

Committer: Monty Taylor
Date: 2008-07-08 20:34:14 UTC
mfrom: (98 drizzle)
mto: (80.3.5 drizzle-stew-remove-old_password) (77.6.1 glibclient-merge)
mto: This revision was merged to the branch mainline in revision 104.
Revision ID: monty@inaugust.com-20080708203414-p95bcchaygwqxl54

Merged from trunk.

files removed:
sql/hash_filo.cc

sql/hash_filo.h

files modified:
client/mysql.cc

client/mysqlbinlog.cc

include/my_time.h

include/mysql_com.h

libmysql/client.c

libmysql/libmysql.c

sql-common/my_time.c

sql/Makefile.am

sql/field.cc

sql/field.h

sql/field_conv.cc

sql/item.cc

sql/item_cmpfunc.cc

sql/item_func.cc

sql/item_sum.cc

sql/item_timefunc.cc

sql/item_timefunc.h

sql/key.cc

sql/mysql_priv.h

sql/mysqld.cc

sql/opt_range.cc

sql/records.cc

sql/rpl_record.cc

sql/rpl_utility.cc

sql/sql_delete.cc

sql/sql_insert.cc

sql/sql_load.cc

sql/sql_plugin.cc

sql/sql_repl.cc

sql/sql_select.cc

sql/sql_show.cc

sql/sql_table.cc

sql/sql_udf.cc

sql/sql_update.cc

sql/sql_yacc.yy

sql/table.cc

sql/time.cc

sql/tztime.cc

sql/tztime.h

sql/uniques.cc

sql/unireg.cc

storage/innobase/handler/ha_innodb.cc

storage/myisam/mi_create.c

storage/myisam/mi_log.c

storage/myisam/mi_open.c

storage/myisam/mi_test2.c

storage/myisam/myisampack.c

storage/myisam/sort.c

strings/do_ctype.c

Show diffs side-by-side

added added

removed removed

278

278

result+= n_full_trees * log2_n_fact(max_elements_in_tree + 1.0);

279

279

result /= TIME_FOR_COMPARE_ROWID;

280

280

281

DBUG_PRINT("info",("unique trees sizes: %u=%u*%lu + %lu", nkeys,

282

n_full_trees, n_full_trees?max_elements_in_tree:0,

283

last_tree_elems));

284

281

285

282

if (!n_full_trees)

286

283

return result;

Older »