Commit 37306fb1 authored Mar 03, 2005 by unknown

Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

parents 436e2f83 41624daa

mysql-test/t/federated.disabled

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		Patrick Galbraith should fix this

server-tools/instance-manager/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,11 +50,11 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \

		CLEANFILES= net_serv.cc client_settings.h

		net_serv.cc: Makefile
		net_serv.cc:
		rm -f $(srcdir)/net_serv.cc
		@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc

		client_settings.h: Makefile
		client_settings.h:
		rm -f $(srcdir)/client_settings.h
		@LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h