bk commit into 5.1 tree (acurtis:1.2332) BUG#22417

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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-09-18 19:31:08-07:00, acurtis@stripped +10 -0
  Bug#22417
    "plug.in not included in dist source"

  storage/archive/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/blackhole/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/csv/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/example/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/federated/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/heap/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/innobase/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/myisam/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/myisammrg/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included in dist

  storage/ndb/Makefile.am@stripped, 2006-09-18 19:31:04-07:00, acurtis@stripped +1 -1
    plug.in needs to be included 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:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/p2-bug22417.1

--- 1.18/storage/heap/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.19/storage/heap/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -50,7 +50,7 @@
 			hp_hash.c _check.c _rectest.c hp_static.c
 
 
-EXTRA_DIST =		CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt plug.in
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.37/storage/myisam/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.38/storage/myisam/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -28,7 +28,7 @@
 
 DEFS =                  @DEFS@
 
-EXTRA_DIST =		mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt
+EXTRA_DIST =		mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in
 pkgdata_DATA =		mi_test_all mi_test_all.res
 
 pkglib_LIBRARIES =	libmyisam.a

--- 1.19/storage/myisammrg/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.20/storage/myisammrg/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -39,7 +39,7 @@
 			myrg_rnext_same.c
 
 
-EXTRA_DIST =		CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt plug.in
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.4/storage/blackhole/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.5/storage/blackhole/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -47,6 +47,6 @@
 libblackhole_a_SOURCES=	ha_blackhole.cc
 
 
-EXTRA_DIST =		CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt plug.in
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.9/storage/csv/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.10/storage/csv/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -41,6 +41,6 @@
 libcsv_a_CXXFLAGS =	$(AM_CFLAGS)
 libcsv_a_SOURCES =	ha_tina.cc
 
-EXTRA_DIST =		CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt plug.in
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.10/storage/example/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.11/storage/example/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -47,6 +47,6 @@
 libexample_a_SOURCES=	ha_example.cc
 
 
-EXTRA_DIST =		CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt plug.in
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.7/storage/archive/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.8/storage/archive/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -57,6 +57,6 @@
 archive_test_LDFLAGS = @NOINST_LDFLAGS@
 
 
-EXTRA_DIST =		CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt plug.in
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.1/storage/federated/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.2/storage/federated/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -47,6 +47,6 @@
 libfederated_a_SOURCES=	ha_federated.cc
 
 
-EXTRA_DIST =		CMakeLists.txt
+EXTRA_DIST =		CMakeLists.txt plug.in
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.21/storage/innobase/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.22/storage/innobase/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -91,7 +91,7 @@
 		include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic
include/ha_prototypes.h \
 		include/ut0list.h include/ut0list.ic \
 		include/ut0wqueue.h \
-		CMakeLists.txt
+		CMakeLists.txt plug.in
 
 noinst_LIBRARIES =	libinnobase.a
 libinnobase_a_LIBADD =	usr/libusr.a srv/libsrv.a dict/libdict.a \

--- 1.18/storage/ndb/Makefile.am	2006-09-18 19:31:21 -07:00
+++ 1.19/storage/ndb/Makefile.am	2006-09-18 19:31:21 -07:00
@@ -1,6 +1,6 @@
 SUBDIRS = src tools . include @ndb_opt_subdirs@
 DIST_SUBDIRS = src tools include test docs
-EXTRA_DIST = config ndbapi-examples
+EXTRA_DIST = config ndbapi-examples plug.in
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am