Commit c0670fca authored by tim@black.box's avatar tim@black.box
Browse files

Merge work.mysql.com:/home/bk/mysql-4.0 into black.box:/u/home/tim/my/4

parents 18206d84 0cbd4b7f

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ 
	hostname.cc init.cc \

	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \

	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \

	item_uniq.cc key.cc lock.cc log.cc log_event.cc \

	item_uniq.cc key.cc lock.cc log.cc log_event.cc mf_iocache.cc\

	mini_client.cc net_pkg.cc net_serv.cc opt_ft.cc opt_range.cc \

	opt_sum.cc procedure.cc records.cc sql_acl.cc \

	repl_failsafe.cc slave.cc \