bk commit into 5.0 tree (kent:1.2061)

[kent]

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
  1.2061 05/10/14 22:11:52 kent@stripped +1 -0
  mysql.spec.sh:
    Removed unneeded/obsolte configure options
    Added archive engine to standard server
    Removed the embedded server from experimental server
    Changed suffix "-Max" => "-max"
    Changed comment string "Max" => "Experimental"

  support-files/mysql.spec.sh
    1.118 05/10/14 22:08:02 kent@stripped +4 -11
    Removed unneeded/obsolte configure options
    Added archive engine to standard server
    Removed the embedded server from experimental server
    Changed suffix "-Max" => "-max"
    Changed comment string "Max" => "Experimental"

# 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:	c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-release

--- 1.117/support-files/mysql.spec.sh	2005-10-13 22:16:19 +02:00
+++ 1.118/support-files/mysql.spec.sh	2005-10-14 22:08:02 +02:00
@@ -252,8 +252,6 @@
 	    --with-readline ;
 	    # Add this for more debugging support
 	    # --with-debug
-	    # Add this for MyISAM RAID support:
-	    # --with-raid
 	    "
 
  # benchdir does not fit in above model. Maybe a separate bench distribution
@@ -296,7 +294,6 @@
 fi
 
 BuildMySQL "--enable-shared \
-		--without-openssl \
 		--with-berkeley-db \
 		--with-innodb \
 		--with-ndbcluster \
@@ -305,9 +302,8 @@
 		--with-example-storage-engine \
 		--with-blackhole-storage-engine \
 		--with-federated-storage-engine \
-		--with-embedded-server \
-		--with-comment=\"MySQL Community Edition - Max (GPL)\" \
-		--with-server-suffix='-Max'"
+		--with-comment=\"MySQL Community Edition - Experimental (GPL)\" \
+		--with-server-suffix='-max'"
 
 make test-force || true
 
@@ -356,11 +352,8 @@
 %endif
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
-		--without-embedded-server \
-		--without-berkeley-db \
-		--with-innodb \
-		--without-vio \
-		--without-openssl"
+		--with-archive-storage-engine \
+		--with-innodb"
 nm --numeric-sort sql/mysqld > sql/mysqld.sym
 
 make test-force || true