Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup

sql/Makefile.am

@@ -27,7 +27,7 @@ WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
 bin_PROGRAMS =          mysql_tzinfo_to_sql
-noinst_PROGRAMS =	gen_lex_hash test_time
+noinst_PROGRAMS =	gen_lex_hash
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			@isam_libs@ \
 			../myisam/libmyisam.a \
@@ -97,10 +97,6 @@ mysql_tzinfo_to_sql_SOURCES =   tztime.cc tzfile.h
 mysql_tzinfo_to_sql_CPPFLAGS =  -DTZINFO2SQL $(AM_CPPFLAGS)
 mysql_tzinfo_to_sql_LDADD =	$(LDADD) $(CXXLDFLAGS)
 
-test_time_SOURCES =     tztime.cc time.cc tzfile.h
-test_time_CPPFLAGS =    -DTESTTIME $(AM_CPPFLAGS)
-test_time_LDADD   =     $(LDADD) $(CXXLDFLAGS)
-
 DEFS =			-DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \