bk commit into 5.1 tree (serg:1.2308)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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
  1.2308 06/04/11 18:04:50 serg@stripped +12 -0
  fixes for 'make dist' and 'make distcheck'

  storage/ndb/Makefile.am
    1.16 06/04/11 18:04:34 serg@stripped +1 -0
    fixes for 'make dist' and 'make distcheck'
    force common.mk.am out of DIST_COMMON (which is otherwise an
    auto-generated list of Makefile's sources) because it's listed
    indirectly in EXTRA_DIST, and with bk -r get, a file cannot be copied
    twice.

  storage/Makefile.am
    1.5 06/04/11 18:04:34 serg@stripped +1 -2
    fixes for 'make dist' and 'make distcheck'
    remove SUBDIRS/DIST_SUBDIRS hack

  plugin/Makefile.am
    1.2 06/04/11 18:04:34 serg@stripped +5 -0
    fixes for 'make dist' and 'make distcheck'
    include plugin/fulltext/configure.in template in the distribution

  mysql-test/ndb/Makefile.am
    1.8 06/04/11 18:04:34 serg@stripped +3 -6
    fixes for 'make dist' and 'make distcheck'
    ndbcluster script is not a "source"
    don't forget to cleanup

  libmysqld/Makefile.am
    1.83 06/04/11 18:04:34 serg@stripped +8 -2
    fixes for 'make dist' and 'make distcheck'
    remove fragile promiscuous search for object files
    if .o file is not where we look for it - extract it from the library

  libmysql_r/Makefile.am
    1.27 06/04/11 18:04:34 serg@stripped +7 -4
    fixes for 'make dist' and 'make distcheck'
    when symlinking all files from libmysql/ take into account that
    srcdir != builddir

  extra/Makefile.am
    1.36 06/04/11 18:04:33 serg@stripped +1 -4
    fixes for 'make dist' and 'make distcheck'
    remove SUBDIR/DIST_SUBDIR hack

  configure.in
    1.359 06/04/11 18:04:33 serg@stripped +23 -12
    fixes for 'make dist' and 'make distcheck'
    create Makefile only if a feature is enabled
    storage engine dirs must not include /
    automatically disable readline/libedit/sql-bench if source dir is missing

  config/ac-macros/zlib.m4
    1.8 06/04/11 18:04:33 serg@stripped +5 -1
    fixes for 'make dist' and 'make distcheck'
    create Makefile only if zlib is used

  config/ac-macros/yassl.m4
    1.15 06/04/11 18:04:33 serg@stripped +5 -6
    fixes for 'make dist' and 'make distcheck'
    create Makefile's only if yassl is used
    yassl_dir must not include /

  Makefile.am
    1.85 06/04/11 18:04:33 serg@stripped +5 -11
    fixes for 'make dist' and 'make distcheck'
    remove double-listing of everything in SUBDIRS and DIST_SUBDIRS
    remove @yassl_dir@, it belongs to extra/Makefile.am
    specify --basedir for mysql_install_db, in case builddir (where mysql_install_db is)
    differs from srcdir (where mysql_fix_privilege_tables.sql is)

  BUILD/compile-dist
    1.7 06/04/11 18:04:33 serg@stripped +3 -1
    fixes for 'make dist' and 'make distcheck'
    include yassl in "dist"

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.84/Makefile.am	Thu Mar 30 11:02:48 2006
+++ 1.85/Makefile.am	Tue Apr 11 18:04:33 2006
@@ -21,25 +21,17 @@ AUTOMAKE_OPTIONS =	foreign
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
 			README COPYING EXCEPTIONS-CLIENT cmakelists.txt
-SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
+SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
-			@sql_union_dirs@ @mysql_se_dirs@ \
+			@sql_union_dirs@ storage \
 			@sql_server@ scripts @man_dirs@ tests \
 			@mysql_se_plugins@ \
 			netware @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@ \
 			plugin win
 
-DIST_SUBDIRS =		. include @docs_dirs@ zlib \
-			@readline_topdir@ sql-common \
-			@thread_dirs@ pstack \
-                        strings mysys dbug extra regex storage \
-                        vio sql libmysql_r libmysql client scripts \
-			@man_dirs@ tests SSL\
-			BUILD netware os2 @libmysqld_dirs@\
-			@bench_dirs@ support-files server-tools tools \
-			plugin win
+DIST_SUBDIRS =		$(SUBDIRS) SSL BUILD os2 
 
 # Run these targets before any others, also make part of clean target,
 # to make sure we create new links after a clean.
@@ -100,9 +92,11 @@ dist-hook:
 	rm -rf `find $(distdir) -type d -name SCCS -print`
 	if echo "$(distdir)" | grep -q '^/' ; then \
 	  scripts/mysql_install_db --no-defaults --windows \
+		--basedir=$(top_srcdir) \
 		--datadir="$(distdir)/win/data"; \
 	else \
 	  scripts/mysql_install_db --no-defaults --windows \
+		 --basedir=$(top_srcdir) \
 		 --datadir="$$(pwd)/$(distdir)/win/data"; \
 	fi
 

--- 1.358/configure.in	Fri Apr  7 14:53:42 2006
+++ 1.359/configure.in	Tue Apr 11 18:04:33 2006
@@ -2304,16 +2304,20 @@ fi
 AC_SUBST(man_dirs)
 AC_SUBST(man1_files)
 
+if test -e sql-bench
+then
 # Shall we build the bench code?
 AC_ARG_WITH(bench,
     [  --without-bench         Skip building of the benchmark suite.],
     [with_bench=$withval],
     [with_bench=yes]
 )
+fi
 
 if test "$with_bench" = "yes"
 then
   bench_dirs="sql-bench"
+  AC_CONFIG_FILES(sql-bench/Makefile)
 else
   bench_dirs=""
 fi
@@ -2332,6 +2336,11 @@ AC_ARG_WITH(libedit,
     [ with_libedit=$withval ],
     [ with_libedit=undefined ]
     )
+if test -z "$with_readline$with_libedit" -a ! -e cmd-line-utils
+then
+  with_readline=no
+  with_libedit=no
+fi
 
 #
 # We support next variants of compilation:
@@ -2408,6 +2417,12 @@ else
           versions of libedit or readline])
     fi
 fi
+if test -n "$readline_basedir"
+then
+  AC_CONFIG_FILES(cmd-line-utils/Makefile dnl
+                  cmd-line-utils/libedit/Makefile dnl
+                  cmd-line-utils/readline/Makefile)
+fi
 fi
 
 AC_SUBST(readline_dir)
@@ -2420,7 +2435,7 @@ MYSQL_CHECK_BIG_TABLES
 MYSQL_CHECK_MAX_INDEXES
 MYSQL_CHECK_REPLICATION
 
-MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl
+MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,innobase,ha_innodb.o,[ dnl
   \$(top_builddir)/storage/innobase/usr/libusr.a dnl
   \$(top_builddir)/storage/innobase/srv/libsrv.a dnl
   \$(top_builddir)/storage/innobase/dict/libdict.a dnl
@@ -2462,24 +2477,24 @@ MYSQL_STORAGE_ENGINE(innobase,,innodb,,,
   other_configures="$other_configures storage/innobase/configure"
 ])
 
-MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[
+MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,bdb,,,[
   MYSQL_SETUP_BERKELEY_DB
 ])
-MYSQL_STORAGE_ENGINE(example,,,,,,storage/example,no,
+MYSQL_STORAGE_ENGINE(example,,,,,,example,no,
  \$(top_builddir)/storage/example/libexample.a,[
   AC_CONFIG_FILES(storage/example/Makefile)
 ])
-MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,,
+MYSQL_STORAGE_ENGINE(archive,,,,,,archive,,
  \$(top_builddir)/storage/archive/libarchive.a, [
   AC_CONFIG_FILES(storage/archive/Makefile)
 ])
-MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,no,
+MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,csv,no,
   \$(top_builddir)/storage/csv/libcsv.a,[
   AC_CONFIG_FILES(storage/csv/Makefile)
 ])
 MYSQL_STORAGE_ENGINE(blackhole)
 MYSQL_STORAGE_ENGINE(federated)
-MYSQL_STORAGE_ENGINE(ndbcluster,,ndbcluster,,,,storage/ndb,,,[
+MYSQL_STORAGE_ENGINE(ndbcluster,,ndbcluster,,,,ndb,,,[
   MYSQL_SETUP_NDBCLUSTER
 ])
 MYSQL_STORAGE_ENGINE(partition,,partition)
@@ -2539,7 +2554,7 @@ then
   AC_SUBST(THREAD_LOBJECTS)
   server_scripts="mysqld_safe mysql_install_db"
   sql_server_dirs="strings mysys dbug extra regex"
-  mysql_se_dirs="storage/myisam storage/myisammrg storage/heap $mysql_se_dirs"
+  mysql_se_dirs="myisam myisammrg heap $mysql_se_dirs"
   sql_server="$sql_server vio sql"
 fi
 
@@ -2610,16 +2625,12 @@ AC_CONFIG_FILES(Makefile extra/Makefile 
  pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
  sql/handlerton.cc sql-common/Makefile SSL/Makefile dnl
  dbug/Makefile scripts/Makefile dnl
- include/Makefile sql-bench/Makefile dnl
+ include/Makefile dnl
  server-tools/Makefile server-tools/instance-manager/Makefile dnl
  tests/Makefile Docs/Makefile support-files/Makefile dnl
  support-files/MacOSX/Makefile mysql-test/Makefile dnl
  mysql-test/ndb/Makefile netware/Makefile dnl
  include/mysql_version.h dnl
- cmd-line-utils/Makefile dnl
- cmd-line-utils/libedit/Makefile dnl
- zlib/Makefile dnl
- cmd-line-utils/readline/Makefile dnl
  plugin/Makefile dnl
  plugin/fulltext/Makefile dnl
  win/Makefile)

--- 1.35/extra/Makefile.am	Fri Mar 24 22:50:44 2006
+++ 1.36/extra/Makefile.am	Tue Apr 11 18:04:33 2006
@@ -23,10 +23,7 @@ BUILT_SOURCES=		$(top_builddir)/include/
                         $(top_builddir)/include/mysqld_ername.h
 pkginclude_HEADERS=	$(BUILT_SOURCES)
 CLEANFILES =		$(BUILT_SOURCES)
-# We never use SUBDIRS here, but needed for automake 1.6.3
-# to generate code to handle DIST_SUBDIRS
-SUBDIRS=
-DIST_SUBDIRS=           yassl
+SUBDIRS =		@yassl_dir@
 
 # This will build mysqld_error.h and sql_state.h
 $(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)

--- 1.7/config/ac-macros/zlib.m4	Sat Apr  1 03:46:55 2006
+++ 1.8/config/ac-macros/zlib.m4	Tue Apr 11 18:04:33 2006
@@ -63,7 +63,7 @@ case $SYSTEM_TYPE in
     ;;
   *)
     AC_ARG_WITH([zlib-dir],
-                AC_HELP_STRING([--with-zlib-dir=DIR],
+                AC_HELP_STRING([--with-zlib-dir=no|bundled|DIR],
                                [Provide MySQL with a custom location of
                                compression library. Given DIR, zlib binary is 
                                assumed to be in $DIR/lib and header files
@@ -113,6 +113,10 @@ case $SYSTEM_TYPE in
     fi
     ;;
 esac
+if test -n "$zlib_dir"
+then
+  AC_CONFIG_FILES(zlib/Makefile)
+fi
 ])
 
 dnl ------------------------------------------------------------------------

--- 1.4/storage/Makefile.am	Fri Dec 23 05:06:01 2005
+++ 1.5/storage/Makefile.am	Tue Apr 11 18:04:34 2006
@@ -20,8 +20,7 @@ AUTOMAKE_OPTIONS =	foreign
 
 # These are built from source in the Docs directory
 EXTRA_DIST =		
-SUBDIRS =	
-DIST_SUBDIRS = . csv example bdb heap innobase myisam myisammrg ndb archive
+SUBDIRS = @mysql_se_dirs@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.6/BUILD/compile-dist	Fri Nov 25 10:48:20 2005
+++ 1.7/BUILD/compile-dist	Tue Apr 11 18:04:33 2006
@@ -52,7 +52,9 @@ fi
   --with-federated-storage-engine \
   --with-berkeley-db \
   --with-innodb \
+  --with-yassl \
   --enable-thread-safe-client \
   --with-extra-charsets=complex \
-  --with-ndbcluster
+  --with-ndbcluster \
+  --with-zlib-dir=bundled
 make

--- 1.82/libmysqld/Makefile.am	Wed Apr  5 11:32:37 2006
+++ 1.83/libmysqld/Makefile.am	Tue Apr 11 18:04:34 2006
@@ -136,12 +136,18 @@ else
 		then \
 		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
 		else \
+		  rm -rf tmp; mkdir tmp; \
 		  (for arc in ./libmysqld_int.a $(INC_LIB); do \
 		    arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
-		    $(AR) t $$arc|xargs -n 1 find $$arpath -name; \
-		    $(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\*
-name; \
+		    artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
+		    for F in `$(AR) t $$arc`; do \
+		      if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
+		      mkdir $$artmp; cd $$artmp; $(AR) x ../../$$arc; \
+		      cd ../..; ls $$artmp/*; \
+		      continue 2; fi; done; \
 		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
 		  $(RANLIB) libmysqld.a	; \
+		  rm -rf tmp; \
 		fi
 endif
 

--- 1.14/config/ac-macros/yassl.m4	Wed Apr  5 10:39:30 2006
+++ 1.15/config/ac-macros/yassl.m4	Tue Apr 11 18:04:33 2006
@@ -1,8 +1,3 @@
-AC_CONFIG_FILES(extra/yassl/Makefile dnl
-extra/yassl/taocrypt/Makefile dnl
-extra/yassl/taocrypt/src/Makefile dnl
-extra/yassl/src/Makefile)
-
 AC_DEFUN([MYSQL_CHECK_YASSL], [
   AC_MSG_CHECKING(for yaSSL)
   AC_ARG_WITH([yassl], [  --with-yassl          Include the yaSSL support],,)
@@ -14,7 +9,11 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
       AC_MSG_ERROR([Cannot configure MySQL to use yaSSL and OpenSSL simultaneously.])
     fi
     AC_MSG_RESULT([using bundled yaSSL])
-    yassl_dir="extra/yassl"
+    AC_CONFIG_FILES(extra/yassl/Makefile dnl
+    extra/yassl/taocrypt/Makefile dnl
+    extra/yassl/taocrypt/src/Makefile dnl
+    extra/yassl/src/Makefile)
+    yassl_dir="yassl"
     yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl
-L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
     yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
     AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL
emulation.])

--- 1.1/plugin/Makefile.am	Wed Dec 28 13:05:20 2005
+++ 1.2/plugin/Makefile.am	Tue Apr 11 18:04:34 2006
@@ -1 +1,6 @@
 SUBDIRS= fulltext
+
+# extra plugin example files are listed here, to
+# keep its Makefile.am cleaner as a template
+EXTRA_DIST= fulltext/configure.in
+

--- 1.26/libmysql_r/Makefile.am	Wed Apr  5 10:39:31 2006
+++ 1.27/libmysql_r/Makefile.am	Tue Apr 11 18:04:34 2006
@@ -29,8 +29,6 @@ INCLUDES =	-I$(top_builddir)/include -I$
 ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
 include $(top_srcdir)/libmysql/Makefile.shared
 
-libmysql_dir = $(top_srcdir)/libmysql
-
 libmysqlclient_r_la_SOURCES = $(target_sources)
 libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
@@ -38,7 +36,12 @@ libmysqlclient_r_la_LDFLAGS = $(target_l
 # This is called from the toplevel makefile
 link_sources:
 	set -x; \
-	for f in `cd $(libmysql_dir) && echo *.[ch]`; do \
+	for f in `cd $(top_srcdir)/libmysql && echo *.[ch]`; do \
+	  rm -f $$f; \
+	  @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
+	done
+	for f in `cd $(top_builddir)/libmysql && echo *.[ch]`; do \
 	  rm -f $$f; \
-	  @LN_CP_F@ $(libmysql_dir)/$$f $$f; \
+	  @LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \
 	done
+

--- 1.7/mysql-test/ndb/Makefile.am	Wed Feb 22 20:16:56 2006
+++ 1.8/mysql-test/ndb/Makefile.am	Tue Apr 11 18:04:34 2006
@@ -1,14 +1,11 @@
 
-BUILT_SOURCES =		ndbcluster
-
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test/ndb
 
-test_SCRIPTS = ndbcluster
-
-noinst_HEADERS = ndbcluster.sh
-
+EXTRA_DIST = ndbcluster.sh
+CLEANFILES = ndbcluster
 dist_test_DATA = ndb_config_2_node.ini ndb_config_1_node.ini
+test_SCRIPTS = ndbcluster
 
 SUFFIXES = .sh
 

--- 1.15/storage/ndb/Makefile.am	Wed Apr 27 04:04:31 2005
+++ 1.16/storage/ndb/Makefile.am	Tue Apr 11 18:04:34 2006
@@ -1,6 +1,7 @@
 SUBDIRS = src tools . include @ndb_opt_subdirs@
 DIST_SUBDIRS = src tools include test docs
 EXTRA_DIST = config ndbapi-examples
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am