bk commit into 5.1 tree (serg:1.2013)

[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.2013 05/12/31 10:13:45 serg@stripped +2 -0
  libarchive.a and storage/archive/Makefile should be specified in
  MYSQL_STORAGE_ENGINE macro (and nowhere else)

  sql/Makefile.am
    1.129 05/12/31 10:13:33 serg@stripped +0 -1
    libarchive.a and storage/archive/Makefile should be specified in
    MYSQL_STORAGE_ENGINE macro (and nowhere else)

  configure.in
    1.330 05/12/31 10:13:33 serg@stripped +4 -3
    libarchive.a and storage/archive/Makefile should be specified in
    MYSQL_STORAGE_ENGINE macro (and nowhere else)

# 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.329/configure.in	Wed Dec 28 13:05:19 2005
+++ 1.330/configure.in	Sat Dec 31 10:13:33 2005
@@ -2439,8 +2439,10 @@ MYSQL_STORAGE_ENGINE(berkeley,,berkeley-
 MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[
   AC_CONFIG_FILES(storage/example/Makefile)
 ])
-MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive)
-dnl MYSQL_STORAGE_ENGINE(csv,,,,,tina_hton,,ha_tina.o)
+MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,,
+ \$(top_builddir)/storage/archive/libarchive.a, [
+  AC_CONFIG_FILES(storage/archive/Makefile)
+])
 MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[
   AC_CONFIG_FILES(storage/csv/Makefile)
 ])
@@ -2565,7 +2567,6 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTION
 AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
  storage/myisam/Makefile storage/myisammrg/Makefile dnl
- storage/archive/Makefile dnl
  os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
  man/Makefile BUILD/Makefile vio/Makefile dnl
  libmysql/Makefile client/Makefile dnl

--- 1.128/sql/Makefile.am	Fri Dec 23 05:04:23 2005
+++ 1.129/sql/Makefile.am	Sat Dec 31 10:13:33 2005
@@ -32,7 +32,6 @@ bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			$(top_builddir)/storage/myisam/libmyisam.a \
 			$(top_builddir)/storage/myisammrg/libmyisammrg.a \
-			$(top_builddir)/storage/archive/libarchive.a \
 			$(top_builddir)/storage/heap/libheap.a \
 			$(top_builddir)/vio/libvio.a \
 			$(top_builddir)/mysys/libmysys.a \