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

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

.bzrignore

@@ -784,3 +784,5 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+extra/tztime.cc
+extra/mysql_tzinfo_to_sql

extra/Makefile.am

@@ -14,11 +14,21 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include @ndbcluster_includes@
+INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include \
+			@ndbcluster_includes@ -I$(top_srcdir)/sql
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 			../dbug/libdbug.a ../strings/libmystrings.a
 bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \
-			resolve_stack_dump mysql_waitpid
+			resolve_stack_dump mysql_waitpid mysql_tzinfo_to_sql
+
+mysql_tzinfo_to_sql_SOURCES = tztime.cc
+mysql_tzinfo_to_sql_CXXFLAGS =  -DTZINFO2SQL $(AM_CXXFLAGS)
+mysql_tzinfo_to_sql_LDADD =	$(LDADD) $(CXXLDFLAGS)
+
+tztime.cc:
+	  rm -f $(srcdir)/tztime.cc; \
+	  @LN_CP_F@ $(top_srcdir)/sql/tztime.cc $(srcdir)/tztime.cc
+
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

sql/Makefile.am

@@ -26,7 +26,6 @@ INCLUDES =		@MT_INCLUDES@ \
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
-bin_PROGRAMS =          mysql_tzinfo_to_sql
 noinst_PROGRAMS =	gen_lex_hash
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			@isam_libs@ \
@@ -93,10 +92,6 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc \
 gen_lex_hash_SOURCES =	gen_lex_hash.cc
 gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)
 
-mysql_tzinfo_to_sql_SOURCES =   tztime.cc tzfile.h
-mysql_tzinfo_to_sql_CPPFLAGS =  -DTZINFO2SQL $(AM_CPPFLAGS)
-mysql_tzinfo_to_sql_LDADD =	$(LDADD) $(CXXLDFLAGS)
-
 DEFS =			-DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \