MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent Date:December 2 2006 10:16pm
Subject:bk commit into 5.0 tree (kent:1.2323) BUG#24557
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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-12-02 23:16:47+01:00, kent@stripped +3 -0
  mysql_install_db.sh:
    If --srcdir and --windows is given, check if error message file
    is in source or build tree (bug#24557)
  Makefile.am:
    Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
  mysql_install_db.sh:
    Added --srcdir=DIR option, used from top Makefile.am in dist-hook
    target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
  Makefile.am:
    Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
    the source and build tree.
    Call "mysql_install_db" with new option --srcdir, to enable the script
    to find all that is needed, if source and build directory is not the same
    (bug#24557)

  Makefile.am@stripped, 2006-12-02 23:13:30+01:00, kent@stripped +13 -11
    Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
    the source and build tree.
    Call "mysql_install_db" with new option --srcdir, to enable the script
    to find all that is needed, if source and build directory is not the same
    (bug#24557)

  include/Makefile.am@stripped, 2006-12-02 23:15:51+01:00, kent@stripped +11 -12
    Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)

  scripts/mysql_install_db.sh@stripped, 2006-12-02 23:11:15+01:00, kent@stripped +7 -1
    If --srcdir and --windows is given, check if error message file
    is in source or build tree (bug#24557)

  scripts/mysql_install_db.sh@stripped, 2006-12-02 20:09:01+01:00, kent@stripped +18 -10
    Added --srcdir=DIR option, used from top Makefile.am in dist-hook
    target, to find "fill_help_tables.sql" in VPATH build (bug#24557)

# 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:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/mysql-5.0-build

--- 1.91/Makefile.am	2006-12-02 23:16:51 +01:00
+++ 1.92/Makefile.am	2006-12-02 23:16:51 +01:00
@@ -49,6 +49,14 @@
 CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
 DISTCLEANFILES = ac_available_languages_fragment
 
+# Our current filtering of "sql_yacc.cc" in "sql/Makefile.am" creates
+# a problem, if a VPATH build and "sql_yacc.cc" was part of the source
+# distribution we end up with one "sql_yacc.cc" in the source tree,
+# and one in the build tree. This breaks "distcleancheck", until this
+# is sorted out we redefine the find that scans for files not removed
+
+distcleancheck_listfiles = find . -name sql_yacc.cc -o -type f -print
+
 linked_include_sources:
 	cd include; $(MAKE) link_sources
 	echo timestamp > linked_include_sources
@@ -93,17 +101,11 @@
 dist-hook:
 	rm -rf `find $(distdir) -type d -name SCCS -print`
 	rm -f  `find $(distdir) -type l -print`
-	if echo "$(distdir)" | grep -q '^/' ; then \
-          mkdir -p "$(distdir)/win" ; \
-	  scripts/mysql_install_db --no-defaults --windows \
-		--basedir=$(top_srcdir) \
-		--datadir="$(distdir)/win/data"; \
-	else \
-          mkdir -p "$$(pwd)/$(distdir)/win" ; \
-	  scripts/mysql_install_db --no-defaults --windows \
-		 --basedir=$(top_srcdir) \
-		 --datadir="$$(pwd)/$(distdir)/win/data"; \
-	fi
+	mkdir -p $(distdir)/win
+	scripts/mysql_install_db --no-defaults --windows \
+		--basedir=$(top_builddir) \
+		--datadir=$(distdir)/win/data \
+		--srcdir=$(top_srcdir)
 
 tags:
 	support-files/build-tags

--- 1.62/include/Makefile.am	2006-12-02 23:16:51 +01:00
+++ 1.63/include/Makefile.am	2006-12-02 23:16:51 +01:00
@@ -15,14 +15,17 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-BUILT_SOURCES =		mysql_version.h my_config.h
-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 \
-			errmsg.h my_global.h my_net.h my_alloc.h \
-			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
+BUILT_SOURCES =		$(HEADERS_GEN) abi_check
+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
+pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
+			my_xml.h mysql_embed.h \
+			my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+			errmsg.h my_global.h my_net.h \
+			my_getopt.h sslopt-longopts.h my_dir.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			mysql_time.h m_ctype.h $(BUILT_SOURCES)
+			m_ctype.h $(HEADERS_GEN)
 noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			heap.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -59,17 +62,13 @@
 #
 
 # Create a icheck file and compare it to the reference
-abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
-           my_alloc.h typelib.h mysql_h.ic
+abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic
 	@set -ex; \
 	if [ @ICHECK@ != no ] ; then \
 	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \
 	  @ICHECK@ --compare mysql_h.ic $@.ic; \
 	fi; \
 	touch abi_check;
-
-all: abi_check
-
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.65/scripts/mysql_install_db.sh	2006-12-02 23:16:51 +01:00
+++ 1.67/scripts/mysql_install_db.sh	2006-12-02 23:16:51 +01:00
@@ -33,6 +33,7 @@
     case "$arg" in
       --force) force=1 ;;
       --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+      --srcdir=*)  srcdir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --user=*)
         # Note that the user will be passed to mysqld so that it runs
@@ -78,6 +79,7 @@
 execdir=
 bindir=
 basedir=
+srcdir=
 force=0
 verbose=0
 fill_help_tables=""
@@ -106,18 +108,24 @@
 fi
 
 # find fill_help_tables.sh
-for i in $basedir/support-files $basedir/share $basedir/share/mysql $basedir/scripts `pwd` `pwd`/scripts @pkgdatadir@
-do
-  if test -f $i/fill_help_tables.sql
-  then
-    pkgdatadir=$i
-  fi
-done
-
-if test -f $pkgdatadir/fill_help_tables.sql
+if test -n "$srcdir"
 then
-  fill_help_tables=$pkgdatadir/fill_help_tables.sql
+  fill_help_tables=$srcdir/scripts/fill_help_tables.sql
 else
+  for i in $basedir/support-files $basedir/share $basedir/share/mysql \
+           $basedir/scripts `pwd` `pwd`/scripts @pkgdatadir@
+  do
+    if test -f $i/fill_help_tables.sql
+    then
+      pkgdatadir=$i
+    fi
+  done
+
+  fill_help_tables=$pkgdatadir/fill_help_tables.sql
+fi
+
+if test ! -f $fill_help_tables
+then
   echo "Could not find help file 'fill_help_tables.sql' in @pkgdatadir@ or inside $basedir".
   exit 1;
 fi
@@ -130,7 +138,13 @@
 if test "$windows" = 1
 then
   mysqld="./sql/mysqld"
-  mysqld_opt="--language=./sql/share/english"
+  if test -n "$srcdir" -a -f $srcdir/sql/share/english/errmsg.sys
+  then
+    langdir=$srcdir/sql/share/english
+  else
+    langdir=./sql/share/english
+  fi
+  mysqld_opt="--language=$langdir"
   scriptdir="./scripts"
 fi
 
Thread
bk commit into 5.0 tree (kent:1.2323) BUG#24557kent2 Dec