Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

.bzrignore

@@ -352,6 +352,7 @@ client/.libs/mysqltest
 client/completion_hash.cpp
 client/decimal.c
 client/insert_test
+client/link_sources
 client/log_event.cc
 client/log_event.h
 client/mf_iocache.c
@@ -379,6 +380,7 @@ client/mysqltestmanager-pwgen
 client/mysqltestmanagerc
 client/mysys_priv.h
 client/readline.cpp
+client/rpl_constants.h
 client/select_test
 client/sql_string.cpp
 client/ssl_test
@@ -574,6 +576,7 @@ help
 help.c
 help.h
 include/check_abi
+include/link_sources
 include/my_config.h
 include/my_global.h
 include/mysql_h.ic
@@ -749,6 +752,7 @@ libmysql/.libs/libmysqlclient.so.15.0.0
 libmysql/conf_to_src
 libmysql/debug/libmysql.exp
 libmysql/libmysql.ver
+libmysql/link_sources
 libmysql/my_static.h
 libmysql/my_time.c
 libmysql/mysys_priv.h
@@ -1084,6 +1088,7 @@ libmysqld/item_uniq.cc
 libmysqld/key.cc
 libmysqld/lib_sql.cpp
 libmysqld/libmysql.c
+libmysqld/link_sources
 libmysqld/lock.cc
 libmysqld/log.cc
 libmysqld/log_event.cc
@@ -2956,4 +2961,3 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
-client/rpl_constants.h

Makefile.am

@@ -31,48 +31,8 @@ SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \
 
 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
 	$(top_builddir)/scripts/mysql_install_db

client/Makefile.am

@@ -36,6 +36,10 @@ noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \
 
 EXTRA_DIST =			get_password.c CMakeLists.txt echo.c
 
+BUILT_SOURCES =			link_sources
+
+CLEANFILES =			$(BUILT_SOURCES)
+
 bin_PROGRAMS =			mysql \
 				mysqladmin \
 				mysqlbinlog \
@@ -110,6 +114,7 @@ link_sources:
          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.%

configure.in

@@ -2258,11 +2258,10 @@ AC_SUBST(tools_dirs)
 #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.
@@ -2272,7 +2271,6 @@ fi
 # 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,
@@ -2453,7 +2451,6 @@ thread_dirs=
 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")
 
@@ -2462,7 +2459,6 @@ then
   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
@@ -2474,18 +2470,14 @@ AC_SUBST(CLIENT_THREAD_LIBS)
 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"

include/Makefile.am

@@ -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,10 @@ EXTRA_DIST =            mysql_h.ic
 DISTCLEANFILES =	sched.h $(CLEANFILES)
 
 link_sources:
-	-$(RM) -fr readline
+	-$(RM) -f readline openssl
 	@readline_h_ln_cmd@
 	@yassl_h_ln_cmd@
+	echo timestamp > link_sources
 
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h

libmysql/Makefile.am

@@ -70,6 +70,7 @@ link_sources:
 	  @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
+	  echo timestamp > link_sources
 
 # This part requires GNUmake
 #

libmysql/Makefile.shared

@@ -79,8 +79,11 @@ target_libadd =		$(mysysobjects) $(mystringsobjects) $(dbugobjects) \
  $(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 \
@@ -104,7 +107,6 @@ clean-local:
 	      `echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \
 	       $(CHARSET_SRCS) $(CHARSET_OBJS) \
 	       $(mystringsextra) $(mysysheaders) $(vioheaders) \
-	       ../linked_libmysql_sources ../linked_libmysql_r_sources \
                net.c
 
 conf_to_src_SOURCES = conf_to_src.c

libmysqld/Makefile.am

@@ -177,11 +177,11 @@ endif
 #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
+BUILT_SOURCES = link_sources
-# to an existing file in source, we do that, else we assume it
+
-# will show up in the build tree eventually (generated file).
+CLEANFILES = $(BUILT_SOURCES)
+
 link_sources:
-	  set -x; \
 	  for f in $(sqlsources); do \
 	    rm -f $$f; \
 	    if test -e $(top_srcdir)/sql/$$f ; \
@@ -215,12 +215,13 @@ link_sources:
 	    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"` \
+	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \
-	       $(top_srcdir)/linked_libmysqld_sources; \
 	rm -f client_settings.h
 
 # Don't update the files from bitkeeper

libmysqld/examples/Makefile.am

@@ -17,10 +17,10 @@ noinst_PROGRAMS = mysql
 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; \
@@ -29,6 +29,7 @@ link_sources:
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/tests/$$f $$f; \
 	done
+	echo timestamp > link_sources
 
 DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \

netware/Makefile.am

@@ -44,12 +44,16 @@ netware_build_files =           client/mysql.def client/mysqladmin.def \
                                 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
+	echo timestamp > link_sources
+
+BUILT_SOURCES =                 link_sources
+CLEANFILES = 			$(BUILT_SOURCES)
+
 else
 
 BUILT_SOURCES =                 libmysql.imp init_db.sql test_db.sql

sql/Makefile.am

@@ -124,11 +124,11 @@ DEFS =			-DMYSQL_SERVER \
 			@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
 DISTCLEANFILES =        $(EXTRA_PROGRAMS)
 MAINTAINERCLEANFILES =  $(BUILT_MAINT_SRC)
 AM_YFLAGS =		-d --verbose