From f2791b9e96e72e76dc5f89508e760b308ad4eaf6 Mon Sep 17 00:00:00 2001
From: "petr@mysql.com" <>
Date: Wed, 2 Mar 2005 23:16:32 +0300
Subject: [PATCH 1/2] fix to avoid relinking on each "make"

---
 server-tools/instance-manager/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index d73ba95ea0a..7b1d0383f46 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -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
 

From 7038981d0b3763b2fadc8e8549dc718493001cb6 Mon Sep 17 00:00:00 2001
From: "patg@krsna.patg.net" <>
Date: Wed, 2 Mar 2005 16:14:46 -0800
Subject: [PATCH 2/2] WL# 2094, removed federated 'disable' file.

---
 mysql-test/t/federated.disabled | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 mysql-test/t/federated.disabled

diff --git a/mysql-test/t/federated.disabled b/mysql-test/t/federated.disabled
deleted file mode 100644
index 5ad728b6f10..00000000000
--- a/mysql-test/t/federated.disabled
+++ /dev/null
@@ -1 +0,0 @@
-Patrick Galbraith should fix this