Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into shark.:/space/ndbdev/clone-mysql-5.0-ndb-daily-2004-12-14

BitKeeper/etc/logging_ok

@@ -155,6 +155,7 @@ mysqldev@mysql.com
 mysqldev@o2k.irixworld.net
 ndbdev@eel.hemma.oreland.se
 ndbdev@ndbmaster.mysql.com
+ndbdev@shark.
 nick@mysql.com
 nick@nick.leippe.com
 papa@gbichot.local

server-tools/instance-manager/Makefile.am

@@ -59,7 +59,7 @@ client_settings.h: Makefile
 	rm -f $(srcdir)/client_settings.h
 	@LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h
 
-bin_PROGRAMS= mysqlmanager
+EXTRA_PROGRAMS= mysqlmanager
 
 mysqlmanager_SOURCES=	command.cc command.h mysqlmanager.cc \
 			manager.h manager.cc log.h log.cc \