From: antony
Date: December 21 2005 10:58pm
Subject: bk commit into 5.1 tree (acurtis:1.1978)
List-Archive: http://lists.mysql.com/commits/345
Message-Id: <200512212259.jBLMxDnX009558@mail.mysql.com>

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
  1.1978 05/12/21 14:58:03 acurtis@stripped +6 -0
  Change for plugin storage engine to be built after mysqld

  storage/example/Makefile.am
    1.3 05/12/21 14:57:53 acurtis@stripped +0 -3
    remove unneeded dep

  storage/csv/Makefile.am
    1.3 05/12/21 14:57:53 acurtis@stripped +0 -3
    remove unneeded dep

  storage/Makefile.am
    1.3 05/12/21 14:57:53 acurtis@stripped +1 -1
    add csv and example to dist

  configure.in
    1.325 05/12/21 14:57:53 acurtis@stripped +1 -0
    Change build order for plugins

  config/ac-macros/storage.m4
    1.3 05/12/21 14:57:53 acurtis@stripped +4 -2
    Change build order for plugins

  Makefile.am
    1.80 05/12/21 14:57:53 acurtis@stripped +1 -0
    Change build order for plugins

# 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:	ltantony.(none)
# Root:	/home/antony/work3/mysql-5.1-plugable-2

--- 1.79/Makefile.am	2005-11-23 04:04:04 -08:00
+++ 1.80/Makefile.am	2005-12-21 14:57:53 -08:00
@@ -26,6 +26,7 @@
 			@thread_dirs@ pstack \
 			@sql_union_dirs@ @mysql_se_dirs@ \
 			@sql_server@ scripts @man_dirs@ tests \
+			@mysql_se_plugins@ \
 			netware @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@
 

--- 1.324/configure.in	2005-12-21 10:24:55 -08:00
+++ 1.325/configure.in	2005-12-21 14:57:53 -08:00
@@ -2520,6 +2520,7 @@
 AC_SUBST(mysql_se_objs)
 AC_SUBST(mysql_se_htons)
 AC_SUBST(mysql_se_decls)
+AC_SUBST(mysql_se_plugins)
 
 
 # Now that sql_client_dirs and sql_server_dirs are stable, determine the union.

--- 1.2/config/ac-macros/storage.m4	2005-12-21 10:18:26 -08:00
+++ 1.3/config/ac-macros/storage.m4	2005-12-21 14:57:53 -08:00
@@ -40,9 +40,11 @@
   mysql_se_decls="${mysql_se_decls},$6"
   mysql_se_htons="${mysql_se_htons},&$6"
   mysql_se_objs="$mysql_se_objs $8"
+  mysql_se_dirs="$mysql_se_dirs $7"
+  mysql_se_libs="$mysql_se_libs $9"
+else
+  mysql_se_plugins="$mysql_se_plugins $7"
 fi
-mysql_se_dirs="$mysql_se_dirs $7"
-mysql_se_libs="$mysql_se_libs $9"
 $10
 fi
 ])

--- 1.2/storage/csv/Makefile.am	2005-12-21 14:03:49 -08:00
+++ 1.3/storage/csv/Makefile.am	2005-12-21 14:57:53 -08:00
@@ -26,9 +26,6 @@
                         -I$(srcdir)
 WRAPLIBS=
 
-$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy
-	( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc )
-
 pkglib_LTLIBRARIES =	ha_csv.la
 
 ha_csv_la_LDFLAGS =	-module

--- 1.2/storage/example/Makefile.am	2005-12-21 14:03:49 -08:00
+++ 1.3/storage/example/Makefile.am	2005-12-21 14:57:53 -08:00
@@ -26,9 +26,6 @@
                         -I$(srcdir)
 WRAPLIBS=
 
-$(top_builddir)/sql/sql_yacc.h: $(top_builddir)/sql/sql_yacc.yy
-	( cd $(top_builddir)/sql && $(MAKE) sql_yacc.cc )
-
 pkglib_LTLIBRARIES =	ha_example.la
 
 ha_example_la_LDFLAGS =	-module

--- 1.2/storage/Makefile.am	2005-05-16 05:11:39 -07:00
+++ 1.3/storage/Makefile.am	2005-12-21 14:57:53 -08:00
@@ -21,7 +21,7 @@
 # These are built from source in the Docs directory
 EXTRA_DIST =		
 SUBDIRS =	
-DIST_SUBDIRS = . bdb heap innobase myisam myisammrg ndb
+DIST_SUBDIRS = . csv example bdb heap innobase myisam myisammrg ndb
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%