bk commit into 5.1 tree (msvensson:1.2427) BUG#22508

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-08 14:55:03+01:00, msvensson@stripped +12 -0
  Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
   - Move the link_sources command from top level Makefile into each subdir
     that need to link files

  BitKeeper/etc/ignore@stripped, 2007-02-08 14:55:02+01:00, msvensson@stripped +4 -0
    Added libmysqld/link_sources libmysql/link_sources include/link_sources
client/link_sources to the ignore list

  Makefile.am@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +0 -40
    Move link_sources down into each sub directory that might need it

  client/Makefile.am@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +6 -3
    Add "link_sources" to BUILT_SOURCES

  config/ac-macros/ssl.m4@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +1 -1
    Add semicolon after the "ln -s" command that links openssl from yassl
    into include thus making it a standalone commmand

  configure.in@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +4 -12
    Move link_sources down into each sub directory that might need it

  include/Makefile.am@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +4 -4
    Add "link_sources" to BUILT_SOURCES

  libmysql/Makefile.am@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +2 -1
    Add "link_sources" to BUILT_SOURCES

  libmysql/Makefile.shared@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +5
-3
    Add "link_sources" to BUILT_SOURCES

  libmysqld/Makefile.am@stripped, 2007-02-08 14:55:01+01:00, msvensson@stripped +8 -7
    Add "link_sources" to BUILT_SOURCES

  libmysqld/examples/Makefile.am@stripped, 2007-02-08 14:55:01+01:00,
msvensson@stripped +4 -3
    Add "link_sources" to BUILT_SOURCES

  netware/Makefile.am@stripped, 2007-02-08 14:55:02+01:00, msvensson@stripped +7 -3
    Add "link_sources" to BUILT_SOURCES

  sql/Makefile.am@stripped, 2007-02-08 14:55:02+01:00, msvensson@stripped +2 -2
    Add "link_sources" to BUILT_SOURCES

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.mysql.com
# Root:	/home/msvensson/mysql/bug22508/my51-bug22508

--- 1.117/Makefile.am	2007-02-06 15:48:05 +01:00
+++ 1.118/Makefile.am	2007-02-08 14:55:01 +01:00
@@ -31,47 +31,7 @@
 
 DIST_SUBDIRS =		$(SUBDIRS) BUILD
 
-# Run these targets before any others, also make part of clean target,
-# to make sure we create new links after a clean.
-BUILT_SOURCES = linked_client_sources linked_server_sources \
-		 @linked_client_targets@ \
-		 @linked_libmysqld_targets@ \
-		 linked_include_sources @linked_netware_sources@
-
-CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = ac_available_languages_fragment
-
-linked_include_sources:
-	cd include; $(MAKE) link_sources
-	echo timestamp > linked_include_sources
-
-linked_client_sources:  @linked_client_targets@
-	cd client; $(MAKE) link_sources
-	echo timestamp > linked_client_sources
-
-linked_libmysql_sources:
-	cd libmysql; $(MAKE) link_sources
-	echo timestamp > linked_libmysql_sources
-
-linked_libmysql_r_sources: linked_libmysql_sources
-	cd libmysql_r; $(MAKE) link_sources
-	echo timestamp > linked_libmysql_r_sources
-
-linked_libmysqld_sources:
-	cd libmysqld; $(MAKE) link_sources
-	echo timestamp > linked_libmysqld_sources
-
-linked_libmysqldex_sources:
-	cd libmysqld/examples; $(MAKE) link_sources
-	echo timestamp > linked_libmysqldex_sources
-
-linked_netware_sources:
-	cd @netware_dir@; $(MAKE) link_sources
-	echo timestamp > linked_netware_sources
-
-linked_server_sources:
-	cd sql; $(MAKE) link_sources
-	echo timestamp > linked_server_sources
 
 # Create permission databases
 init-db:		all

--- 1.83/client/Makefile.am	2006-12-31 01:06:32 +01:00
+++ 1.84/client/Makefile.am	2007-02-08 14:55:01 +01:00
@@ -36,6 +36,10 @@
 
 EXTRA_DIST =			get_password.c CMakeLists.txt
 
+BUILT_SOURCES =			link_sources
+
+CLEAN_FILES =			$(BUILT_SOURCES)
+
 bin_PROGRAMS =			mysql \
 				mysqladmin \
 				mysqlbinlog \
@@ -63,7 +67,7 @@
 mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)
 
 mysqldump_SOURCES=              mysqldump.c \
-				my_user.c \
+				$(top_srcdir)/sql-common/my_user.c \
 	                        $(top_srcdir)/mysys/mf_getdate.c
 
 mysqlimport_SOURCES=		mysqlimport.c
@@ -106,8 +110,7 @@
           rm -f $(srcdir)/$$f; \
           @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
          done; \
-         rm -f $(srcdir)/my_user.c; \
-         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
+	echo timestamp > link_sources;
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.434/configure.in	2007-02-06 15:52:22 +01:00
+++ 1.435/configure.in	2007-02-08 14:55:01 +01:00
@@ -2257,11 +2257,10 @@
 #MYSQL_CHECK_CPU
 
 libmysqld_dirs=
-linked_libmysqld_targets=
 if test "$with_embedded_server" = "yes"
 then
   libmysqld_dirs=libmysqld
-  linked_libmysqld_targets="linked_libmysqld_sources linked_libmysqldex_sources"
+
   AC_CONFIG_FILES(libmysqld/Makefile libmysqld/examples/Makefile)
   # We can't build embedded library without building the server, because
   # we depend on libmysys, libmystrings, libmyisam, etc.
@@ -2271,7 +2270,6 @@
 # mysql_config --libmysqld-libs will print out something like
 # -L/path/to/lib/mysql -lmysqld -lmyisam -lmysys -lmystrings -ldbug ...
 AC_SUBST([libmysqld_dirs])
-AC_SUBST([linked_libmysqld_targets])
 
 # Shall we build the docs?
 AC_ARG_WITH(docs,
@@ -2371,7 +2369,7 @@
     readline_basedir="libedit"
     readline_dir="$readline_topdir/$readline_basedir"
     readline_link="\$(top_builddir)/cmd-line-utils/libedit/libedit.a"
-    readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/libedit/readline readline"
+    readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/libedit/readline
readline;"
     compile_libedit=yes
     AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, 1)
     AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE, 1)
@@ -2381,7 +2379,7 @@
     readline_basedir="readline"
     readline_dir="$readline_topdir/$readline_basedir"
     readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
-    readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/readline readline"
+    readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/readline readline;"
     compile_readline=yes
     want_to_use_readline="yes"
     AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
@@ -2446,7 +2444,6 @@
 dnl This probably should be cleaned up more - for now the threaded
 dnl client is just using plain-old libs.
 sql_client_dirs=
-linked_client_targets="linked_libmysql_sources"
 
 AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
 
@@ -2455,7 +2452,6 @@
   sql_client_dirs="strings regex mysys dbug extra libmysql client"
 else
   sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"
-  linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
   AC_CONFIG_FILES(libmysql_r/Makefile)
   AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should the client be thread safe])
 fi
@@ -2467,18 +2463,14 @@
 AC_SUBST(NON_THREADED_LIBS)
 AC_SUBST(STATIC_NSS_FLAGS)
 AC_SUBST(sql_client_dirs)
-AC_SUBST(linked_client_targets)
 
-# If configuring for NetWare, set up to link sources from and build the netware directory
+# If configuring for NetWare, build the netware directory
 netware_dir=
-linked_netware_sources=
 if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null
 then
   netware_dir="netware"
-  linked_netware_sources="linked_netware_sources"
 fi
 AC_SUBST(netware_dir)
-AC_SUBST(linked_netware_sources)
 AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
 
 if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"

--- 1.77/include/Makefile.am	2006-12-31 01:06:32 +01:00
+++ 1.78/include/Makefile.am	2007-02-08 14:55:01 +01:00
@@ -16,7 +16,7 @@
 # MA 02111-1307, USA
 
 # FIXME 'abi_check' should be in BUILT_SOURCES, disabled for now
-BUILT_SOURCES =		$(HEADERS_GEN)
+BUILT_SOURCES =		$(HEADERS_GEN) link_sources
 HEADERS_GEN =		mysql_version.h my_config.h
 HEADERS_ABI =		mysql.h mysql_com.h mysql_time.h \
 			my_list.h my_alloc.h typelib.h
@@ -48,9 +48,9 @@
 DISTCLEANFILES =	sched.h $(CLEANFILES)
 
 link_sources:
-	-$(RM) -fr readline
-	@readline_h_ln_cmd@
-	@yassl_h_ln_cmd@
+	@readline_h_ln_cmd@ \
+	@yassl_h_ln_cmd@ \
+	echo timestamp > link_sources
 
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h

--- 1.55/libmysql/Makefile.am	2006-12-31 01:06:32 +01:00
+++ 1.56/libmysql/Makefile.am	2007-02-08 14:55:01 +01:00
@@ -69,7 +69,8 @@
 	  rm -f net.c; \
 	  @LN_CP_F@ $(top_srcdir)/sql/net_serv.cc net.c ; \
 	  rm -f password.c; \
-	  @LN_CP_F@ $(top_srcdir)/sql/password.c password.c
+	  @LN_CP_F@ $(top_srcdir)/sql/password.c password.c; \
+	  echo timestamp > link_sources
 
 # This part requires GNUmake
 #

--- 1.173/sql/Makefile.am	2007-02-07 15:11:17 +01:00
+++ 1.174/sql/Makefile.am	2007-02-08 14:55:02 +01:00
@@ -123,11 +123,11 @@
 			@DEFS@
 
 BUILT_MAINT_SRC =	sql_yacc.cc sql_yacc.h
-BUILT_SOURCES =		$(BUILT_MAINT_SRC) lex_hash.h
+BUILT_SOURCES =		$(BUILT_MAINT_SRC) lex_hash.h link_sources
 EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
 			nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
 			udf_example.c udf_example.def
-CLEANFILES =        	lex_hash.h sql_yacc.output
+CLEANFILES =        	lex_hash.h sql_yacc.output link_sources
 MAINTAINERCLEANFILES =  $(BUILT_MAINT_SRC)
 AM_YFLAGS =		-d --verbose
 

--- 1.23/netware/Makefile.am	2006-12-02 06:09:30 +01:00
+++ 1.24/netware/Makefile.am	2007-02-08 14:55:02 +01:00
@@ -44,16 +44,20 @@
                                 storage/myisam/myisam_ftdump.def
 
 link_sources:
-	set -x; \
 	for f in $(netware_build_files); do \
 	  rm -f ../$$f; \
 	  org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
 	  @LN_CP_F@ $(srcdir)/$$org ../$$f; \
-	done
+	done; \
+	echo timestamp > link_sources
+
+BUILT_SOURCES =                 link_sources
+CLEANFILES = 			$(BUILT_SOURCES)
+
 else
 
 BUILT_SOURCES =                 libmysql.imp
-DISTCLEANFILES =                $(BUILT_SOURCES)
+CLEANFILES = 			$(BUILT_SOURCES)
 
 # Create the libmysql.imp from libmysql/libmysql.def
 libmysql.imp: $(top_srcdir)/libmysql/libmysql.def

--- 1.108/libmysqld/Makefile.am	2007-01-12 16:11:45 +01:00
+++ 1.109/libmysqld/Makefile.am	2007-02-08 14:55:01 +01:00
@@ -176,11 +176,11 @@
 #libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
 #CLEANFILES =		$(libmysqld_la_LIBADD) libmysqld.la
 
-# This is called from the toplevel makefile. If we can link now
-# to an existing file in source, we do that, else we assume it
-# will show up in the build tree eventually (generated file).
+BUILT_SOURCES = link_sources
+
+CLEANFILES = $(BUILT_SOURCES)
+
 link_sources:
-	  set -x; \
 	  for f in $(sqlsources); do \
 	    rm -f $$f; \
 	    if test -e $(top_srcdir)/sql/$$f ; \
@@ -214,12 +214,13 @@
 	    done; \
 	  fi; \
 	  rm -f client_settings.h; \
-	  @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h
+	  @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h \
+                                          client_settings.h; \
+	echo timestamp > link_sources
 
 
 clean-local:
-	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) |
sed "s;\.lo;.c;g"` \
-	       $(top_srcdir)/linked_libmysqld_sources; \
+	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) |
sed "s;\.lo;.c;g"`; \
 	rm -f client_settings.h
 
 # Don't update the files from bitkeeper

--- 1.4/config/ac-macros/ssl.m4	2006-11-29 18:30:30 +01:00
+++ 1.5/config/ac-macros/ssl.m4	2007-02-08 14:55:01 +01:00
@@ -47,7 +47,7 @@
   AC_SUBST([yassl_taocrypt_extra_cxxflags])
 
   # Link extra/yassl/include/openssl subdir to include/
-  yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"
+  yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl;"
   AC_SUBST(yassl_h_ln_cmd)
 
   AC_MSG_RESULT([using bundled yaSSL])

--- 1.274/BitKeeper/etc/ignore	2007-02-06 15:12:02 +01:00
+++ 1.275/BitKeeper/etc/ignore	2007-02-08 14:55:02 +01:00
@@ -2937,3 +2937,7 @@
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+libmysqld/link_sources
+libmysql/link_sources
+include/link_sources
+client/link_sources

--- 1.36/libmysqld/examples/Makefile.am	2006-12-23 20:19:45 +01:00
+++ 1.37/libmysqld/examples/Makefile.am	2007-02-08 14:55:01 +01:00
@@ -17,10 +17,10 @@
 bin_PROGRAMS    = mysqltest_embedded mysql_client_test_embedded
 client_sources  = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
 tests_sources   = $(mysql_client_test_embedded_SOURCES)
-CLEANFILES      = $(client_sources) $(tests_sources)
+BUILT_SOURCES   = link_sources
+CLEANFILES      = $(client_sources) $(tests_sources) $(BUILT_SOURCES)
 
 link_sources:
-	set -x; \
 	for f in $(client_sources); do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/client/$$f $$f; \
@@ -28,7 +28,8 @@
 	for f in $(tests_sources); do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/tests/$$f $$f; \
-	done
+	done; \
+	echo timestamp > link_sources
 
 DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \

--- 1.70/libmysql/Makefile.shared	2006-11-27 22:58:10 +01:00
+++ 1.71/libmysql/Makefile.shared	2007-02-08 14:55:01 +01:00
@@ -79,8 +79,11 @@
  $(sql_cmn_objects) $(vio_objects) $(sqlobjects)
 target_ldflags = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@ 
 vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo
+
+BUILT_SOURCES		= link_sources
+
 CLEANFILES =		$(target_libadd) $(SHLIBOBJS) \
-			$(target)
+			$(target) $(BUILT_SOURCES)
 DEFS =			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
 			-DDEFAULT_HOME_ENV=MYSQL_HOME \
@@ -103,8 +106,7 @@
 	      `echo $(vio_objects) | sed "s;\.lo;.c;g"` \
 	      `echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \
 	       $(CHARSET_SRCS) $(CHARSET_OBJS) \
-	       $(mystringsextra) $(mysysheaders) $(vioheaders)\
-	       ../linked_libmysql_sources ../linked_libmysql_r_sources \
+	       $(mystringsextra) $(mysysheaders) $(vioheaders) \
                net.c
 
 conf_to_src_SOURCES = conf_to_src.c