bk commit into 5.1 tree (msvensson:1.2577)

[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-04-11 09:34:02+02:00, msvensson@stripped +8 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.2409.105.1

  BitKeeper/etc/ignore@stripped, 2007-04-11 09:14:01+02:00, msvensson@stripped +5 -5
    auto-union
    MERGE: 1.274.1.1

  Makefile.am@stripped, 2007-04-11 09:14:09+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.117.1.1

  client/Makefile.am@stripped, 2007-04-11 09:34:00+02:00, msvensson@stripped +0 -0
    Merge
    MERGE: 1.83.1.1

  configure.in@stripped, 2007-04-11 09:14:09+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.434.3.1

  include/Makefile.am@stripped, 2007-04-11 09:14:09+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.77.1.1

  libmysqld/Makefile.am@stripped, 2007-04-11 09:14:09+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.108.1.1

  netware/Makefile.am@stripped, 2007-04-11 09:34:00+02:00, msvensson@stripped +0 -1
    Merge
    MERGE: 1.23.2.1

  sql/Makefile.am@stripped, 2007-04-11 09:34:00+02:00, msvensson@stripped +0 -0
    Merge
    MERGE: 1.173.2.1

# 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.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.122/Makefile.am	2007-03-28 23:17:53 +02:00
+++ 1.123/Makefile.am	2007-04-11 09:14:09 +02:00
@@ -31,47 +31,7 @@ SUBDIRS =		. include @docs_dirs@ @zlib_d
 
 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.88/client/Makefile.am	2007-04-03 07:21:37 +02:00
+++ 1.89/client/Makefile.am	2007-04-11 09:34:00 +02:00
@@ -36,6 +36,10 @@ noinst_HEADERS =		sql_string.h completio
 
 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.%

--- 1.448/configure.in	2007-03-28 23:03:31 +02:00
+++ 1.449/configure.in	2007-04-11 09:14:09 +02:00
@@ -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"

--- 1.78/include/Makefile.am	2007-03-12 13:29:07 +01:00
+++ 1.79/include/Makefile.am	2007-04-11 09:14:09 +02: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,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

--- 1.180/sql/Makefile.am	2007-04-04 12:42:51 +02:00
+++ 1.181/sql/Makefile.am	2007-04-11 09:34:00 +02:00
@@ -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

--- 1.26/netware/Makefile.am	2007-03-21 14:34:23 +01:00
+++ 1.27/netware/Makefile.am	2007-04-11 09:34:00 +02:00
@@ -44,12 +44,16 @@ netware_build_files =           client/m
                                 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

--- 1.109/libmysqld/Makefile.am	2007-02-23 12:13:47 +01:00
+++ 1.110/libmysqld/Makefile.am	2007-04-11 09:14:09 +02:00
@@ -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
-# 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 ; \
@@ -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"` \
-	       $(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.284/BitKeeper/etc/ignore	2007-04-03 07:20:52 +02:00
+++ 1.285/BitKeeper/etc/ignore	2007-04-11 09:14:01 +02:00
@@ -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