MySQL Lists: commits: bk commit into 5.0 tree (msvensson:1.2296) BUG#22508

List:	Commits	« Previous Message Next Message »
From:	msvensson	Date:	November 27 2006 10:39pm
Subject:	bk commit into 5.0 tree (msvensson:1.2296) BUG#22508
View as plain text
Below is the list of changes that have just been committed into a local
5.0 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, 2006-11-27 22:39:22+01:00, msvensson@neptunus.(none) +11 -0
  Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit
   - push down link_sources into the respecitive subdirectory
   - Remove link_sources from sql/

  BitKeeper/deleted/.del-abi_check.ic@stripped, 2006-11-09 14:24:08+01:00,
msvensson@neptunus.(none) +0 -0
    Delete: include/abi_check.ic

  Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +0 -39
    Push link_sources down into each sub directory

  client/Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +10 -5
    Push link_sources down into each sub directory
    Remove link for sql-common/my_user.c

  configure.in@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +2 -7
    Remove link_sources code from configure.in

  include/Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +2 -1
    Push link_sources down into each sub directory

  libmysql/Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +7 -2
    Push link_sources down into each sub directory

  libmysql_r/Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +5 -1
    Push link_sources down into each sub directory

  libmysqld/Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +7 -3
    Push link_sources down into each sub directory

  libmysqld/examples/Makefile.am@stripped, 2006-11-27 22:39:19+01:00,
msvensson@neptunus.(none) +5 -3
    Push link_sources down into each sub directory

  netware/Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +7 -1
    Push link_sources down into each sub directory

  sql/Makefile.am@stripped, 2006-11-27 22:39:19+01:00, msvensson@neptunus.(none) +27 -27
    Remove "link_sources" from sql directory

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug22508/my50-bug22508

--- 1.86/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.87/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -35,51 +35,12 @@ DIST_SUBDIRS =		. include @docs_dirs@ zl
 			BUILD netware os2 @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@ win
 
-# 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@
-
 # The db.h file is a bit special, see note in "configure.in".
 # In the case we didn't compile with bdb, a dummy file is put
 # there, but will not be removed by the bdb make file becuase
 # it will never be called.
 CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
 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.59/client/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.60/client/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -49,7 +49,8 @@ mysqltestmanager_pwgen_SOURCES =   mysql
 mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)
 mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)
 mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)
-mysqldump_SOURCES=              mysqldump.c my_user.c \
+mysqldump_SOURCES=              mysqldump.c \
+				$(top_srcdir)/sql-common/my_user.c \
 	                        $(top_srcdir)/mysys/mf_getdate.c \
                                 $(yassl_dummy_link_fix)
 mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)
@@ -64,17 +65,21 @@ DEFS =			-DUNDEF_THREADS_HACK \
 
 EXTRA_DIST =		get_password.c CMakeLists.txt
 
+BUILT_SOURCES =         link_sources
+
+CLEANFILES =            $(BUILT_SOURCES)
+
 link_sources:
+	set -e; \
 	for f in $(sql_src) ; do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
-         done; \
+        done; \
         for f in $(strings_src) ; do \
           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;
+        done; \
+	echo timestamp > link_sources;
 
 
 # Don't update the files from bitkeeper

--- 1.407/configure.in	2006-11-27 22:39:27 +01:00
+++ 1.408/configure.in	2006-11-27 22:39:27 +01:00
@@ -2312,11 +2312,10 @@ MYSQL_CHECK_OPENSSL
 MYSQL_CHECK_YASSL
 
 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.
@@ -2326,7 +2325,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,
@@ -2495,12 +2493,10 @@ 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="strings regex mysys libmysql client"
-linked_client_targets="linked_libmysql_sources"
 
 if test "$THREAD_SAFE_CLIENT" != "no"
 then
-  sql_client_dirs="libmysql_r $sql_client_dirs"
-  linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
+  sql_client_dirs="$sql_client_dirs libmysql_r"
   AC_CONFIG_FILES(libmysql_r/Makefile)
   AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
 fi
@@ -2511,7 +2507,6 @@ AC_SUBST(CLIENT_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
 netware_dir=

--- 1.62/include/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.63/include/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -15,7 +15,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-BUILT_SOURCES =		mysql_version.h my_config.h
+BUILT_SOURCES =		mysql_version.h my_config.h link_sources
 pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
 			mysql.h mysql_com.h mysql_embed.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
@@ -45,6 +45,7 @@ link_sources:
 	-$(RM) -fr readline
 	@readline_h_ln_cmd@
 	@yassl_h_ln_cmd@
+	echo timestamp > link_sources
 
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h

--- 1.51/libmysql/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.52/libmysql/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -26,6 +26,10 @@ LIBS =		@CLIENT_LIBS@ 
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \
 		$(openssl_includes) @ZLIB_INCLUDES@
 
+BUILT_SOURCES = link_sources
+
+CLEAN_FILES = $(BUILT_SOURCES)
+
 include $(srcdir)/Makefile.shared
 
 libmysqlclient_la_SOURCES = $(target_sources)
@@ -36,7 +40,7 @@ noinst_HEADERS = client_settings.h
 
 # This is called from the toplevel makefile
 link_sources:
-	  set -x; \
+	  set -e; \
 	  ss=`echo $(mystringsobjects) | sed "s;\.lo;.c;g"`; \
 	  ds=`echo $(dbugobjects) | sed "s;\.lo;.c;g"`; \
 	  ms=`echo $(mysysobjects) | sed "s;\.lo;.c;g"`; \
@@ -69,7 +73,8 @@ link_sources:
 	  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.126/sql/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.127/sql/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -20,16 +20,21 @@ MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
 INCLUDES =		@ZLIB_INCLUDES@ \
-			@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
-			-I$(top_builddir)/include -I$(top_srcdir)/include \
-			-I$(top_srcdir)/regex -I$(srcdir) \
+			@bdb_includes@ \
+			@innodb_includes@ \
+			@ndbcluster_includes@ \
+			-I$(top_builddir)/include \
+			-I$(top_srcdir)/include \
+			-I$(top_srcdir)/regex \
+			-I$(srcdir) \
                         $(openssl_includes)
+
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
 EXTRA_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
-gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
+
 LDADD =			$(top_builddir)/myisam/libmyisam.a \
 			$(top_builddir)/myisammrg/libmyisammrg.a \
 			$(top_builddir)/heap/libheap.a \
@@ -37,7 +42,8 @@ LDADD =			$(top_builddir)/myisam/libmyis
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
 			$(top_builddir)/regex/libregex.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
+			$(top_builddir)/strings/libmystrings.a \
+			@ZLIB_LIBS@ @NDB_SCI_LIBS@
 
 mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
 			@bdb_libs@ @innodb_libs@ @pstack_libs@ \
@@ -93,21 +99,29 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
 			slave.cc sql_repl.cc sql_union.cc sql_derived.cc \
-			client.c sql_client.cc mini_client_errors.c pack.c\
+			sql_client.cc \
+			$(top_srcdir)/libmysql/errmsg.c \
+			$(top_srcdir)/sql-common/pack.c \
+			$(top_srcdir)/sql-common/client.c \
+			$(top_srcdir)/sql-common/my_time.c \
+			$(top_srcdir)/sql-common/my_user.c \
 			stacktrace.c repl_failsafe.h repl_failsafe.cc \
 			sql_olap.cc sql_view.cc \
 			gstream.cc spatial.cc sql_help.cc sql_cursor.cc \
-			tztime.cc my_time.c my_user.c my_decimal.cc\
+			tztime.cc my_decimal.cc\
 			sp_head.cc sp_pcontext.cc  sp_rcontext.cc sp.cc \
 			sp_cache.cc parse_file.cc sql_trigger.cc \
 			examples/ha_example.cc ha_archive.cc \
 			examples/ha_tina.cc ha_blackhole.cc \
 			ha_federated.cc
 
+gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 gen_lex_hash_SOURCES =	gen_lex_hash.cc
 gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)
-mysql_tzinfo_to_sql_SOURCES =   mysql_tzinfo_to_sql.cc
+
+mysql_tzinfo_to_sql_SOURCES =   tztime.cc
 mysql_tzinfo_to_sql_LDADD =  @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
+mysql_tzinfo_to_sql_CXXFLAGS = -DTZINFO2SQL
 
 DEFS =			-DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
@@ -116,31 +130,16 @@ DEFS =			-DMYSQL_SERVER \
 			@DEFS@
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
+
 EXTRA_DIST =		$(BUILT_SOURCES) nt_servc.cc nt_servc.h \
 			message.mc examples/CMakeLists.txt CMakeLists.txt \
 			udf_example.c udf_example.def
-DISTCLEANFILES =        lex_hash.h sql_yacc.output
 
-AM_YFLAGS =		-d --debug --verbose
+CLEANFILES =            $(BUILT_SOURCES)
 
-mysql_tzinfo_to_sql.cc:
-	rm -f mysql_tzinfo_to_sql.cc
-	@LN_CP_F@ $(srcdir)/tztime.cc mysql_tzinfo_to_sql.cc
-
-link_sources: mysql_tzinfo_to_sql.cc
-	rm -f mini_client_errors.c
-	@LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c mini_client_errors.c
-	rm -f pack.c
-	@LN_CP_F@ $(top_srcdir)/sql-common/pack.c pack.c
-	rm -f client.c
-	@LN_CP_F@ $(top_srcdir)/sql-common/client.c client.c
-	rm -f my_time.c
-	@LN_CP_F@ $(top_srcdir)/sql-common/my_time.c my_time.c
-	rm -f my_user.c
-	@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c
+DISTCLEANFILES =        lex_hash.h sql_yacc.output
 
-mysql_tzinfo_to_sql.o:	$(mysql_tzinfo_to_sql_SOURCES)
-			$(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $<
+AM_YFLAGS =		-d --debug --verbose
 
 # Try to get better dependencies for the grammar. Othervise really bad
 # things like different grammars for different pars of MySQL can
@@ -168,3 +167,4 @@ udf_example_la_LDFLAGS= -module -rpath $
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
+

--- 1.18/netware/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.19/netware/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -15,6 +15,8 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 if HAVE_NETWARE
+
+BUILT_SOURCES =                 link_sources
 INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include -I..
 LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 				../dbug/libdbug.a ../strings/libmystrings.a
@@ -44,7 +46,11 @@ link_sources:
 	  rm -f ../$$f; \
 	  org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
 	  @LN_CP_F@ $(srcdir)/$$org ../$$f; \
-	done
+	done; \
+	echo timestamp > link_sources;
+
+CLEAN_FILES =                  $(BUILT_SOURCES)
+
 else
 
 BUILT_SOURCES =                 libmysql.imp

--- 1.69/libmysqld/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.70/libmysqld/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -118,9 +118,12 @@ endif
 #libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
 #CLEANFILES =		$(libmysqld_la_LIBADD) libmysqld.la
 
-# This is called from the toplevel makefile
+BUILT_SOURCES = link_sources
+
+CLEANFILES =  $(BUILT_SOURCES)
+
 link_sources:
-	  set -x; \
+	  set -e; \
 	  for f in $(sqlsources); do \
 	    rm -f $$f; \
 	    @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
@@ -134,7 +137,8 @@ link_sources:
 	    @LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \
 	  done; \
 	  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:

--- 1.33/libmysqld/examples/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.34/libmysqld/examples/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -18,10 +18,11 @@ 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; \
+	set -e; \
 	for f in $(client_sources); do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/client/$$f $$f; \
@@ -29,7 +30,8 @@ link_sources:
 	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.26/libmysql_r/Makefile.am	2006-11-27 22:39:27 +01:00
+++ 1.27/libmysql_r/Makefile.am	2006-11-27 22:39:27 +01:00
@@ -26,6 +26,9 @@ LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
 
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \
 		$(openssl_includes) @ZLIB_INCLUDES@
+
+BUILT_SOURCES = link_sources
+
 ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
 include $(top_srcdir)/libmysql/Makefile.shared
 
@@ -41,4 +44,5 @@ link_sources:
 	for f in `cd $(libmysql_dir) && echo *.[ch]`; do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(libmysql_dir)/$$f $$f; \
-	done
+	done; \
+	echo timestamp > link_sources;
Thread
• bk commit into 5.0 tree (msvensson:1.2296) BUG#22508	msvensson	27 Nov