bzr commit into mysql-6.0 branch (alik:2779)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/00.builds/azalea/ based on revid:alik@stripped

 2779 Alexander Nozdrin	2009-05-21
      Disable Falcon and Maria.

    modified:
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/compile-dist
      storage/falcon/plug.in
      storage/maria/plug.in
=== modified file 'BUILD/SETUP.sh'
--- a/BUILD/SETUP.sh	2009-04-14 19:14:18 +0000
+++ b/BUILD/SETUP.sh	2009-05-21 19:00:45 +0000
@@ -151,7 +151,8 @@ base_configs="--prefix=$prefix --enable-
 base_configs="$base_configs --with-extra-charsets=complex "
 base_configs="$base_configs --enable-thread-safe-client "
 base_configs="$base_configs --with-big-tables"
-base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables"
+# Disable Maria.
+# base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables"
 
 if test -d "$path/../cmd-line-utils/readline"
 then

=== modified file 'BUILD/build_mccge.sh'
--- a/BUILD/build_mccge.sh	2008-02-07 23:37:56 +0000
+++ b/BUILD/build_mccge.sh	2009-05-21 19:00:45 +0000
@@ -343,8 +343,7 @@ extended_usage()
     in any of the others.
 
   --with-falcon
-    Specifically included in the "pro" and "extended" packages, and not
-    in any of the others.
+    Not include in any package.
 
   --with-comment
     Sets the comment for the MySQL version, by package, as described
@@ -1075,7 +1074,6 @@ set_pro_package()
 {
   base_configs="$base_configs $engine_configs"
   base_configs="$base_configs --with-innodb"
-  base_configs="$base_configs --with-falcon"
   base_configs="$base_configs --with-comment=\"MySQL Pro $version_text built from source\""
   if test "x$with_debug_flag" = "xyes" ; then
     base_configs="$base_configs --with-server-suffix=\"-debug\""
@@ -1091,7 +1089,6 @@ set_cge_extended_package()
   base_configs="$base_configs --without-ndb-debug"
   base_configs="$base_configs $engine_configs"
   base_configs="$base_configs --with-innodb"
-  base_configs="$base_configs --with-falcon"
   base_configs="$base_configs --with-comment=\"MySQL Cluster Carrier Grade Extended Edition $version_text built from source\""
   if test "x$with_debug_flag" = "xyes" ; then
     base_configs="$base_configs --with-server-suffix=\"-cge-extended-debug\""

=== modified file 'BUILD/compile-dist'
--- a/BUILD/compile-dist	2009-04-03 23:38:18 +0000
+++ b/BUILD/compile-dist	2009-05-21 19:00:45 +0000
@@ -70,9 +70,9 @@ fi
 # Make sure to enable all features that affect "make dist"
 # Remember that configure restricts the man pages to the configured features !
 ./configure \
-  --with-maria-storage-engine \
   --with-embedded-server \
-  --with-falcon \
   --with-ndbcluster
+#  --with-maria-storage-engine
+#  --with-falcon
 $gmake
 

=== modified file 'storage/falcon/plug.in'
--- a/storage/falcon/plug.in	2009-03-26 11:21:23 +0000
+++ b/storage/falcon/plug.in	2009-05-21 19:00:45 +0000
@@ -1,5 +1,5 @@
 MYSQL_STORAGE_ENGINE(falcon, falcon, [Falcon Storage Engine],
-        [Transactional tables using Falcon], [max,max-no-ndb])
+        [Transactional tables using Falcon], [])
 MYSQL_PLUGIN_DIRECTORY(falcon, [storage/falcon])
 MYSQL_PLUGIN_STATIC(falcon,    [libfalcon.a])
 MYSQL_PLUGIN_DYNAMIC(falcon,   [ha_falcon.la])
@@ -7,6 +7,10 @@ MYSQL_PLUGIN_DYNAMIC(falcon,   [ha_falco
 # Check if we have the atomic_* functions on Solaris
 AC_CHECK_FUNC(atomic_cas_32, AC_DEFINE([HAVE_SOLARIS_ATOMIC], [1], [Define to 1 if Solaris support atomic functions.]))
 
+# Disable Falcon by default.
+[[ "X$with_plugin_falcon" == "X" ]] && with_plugin_falcon=no
+[[ "X$mysql_plugin_falcon" == "X" ]] && mysql_plugin_falcon=no
+
 # Check for supported machine types.
 AC_CACHE_CHECK([if Falcon Storage Engine is supported on $MACHINE_TYPE],
   			   falcon_cv_supported_by_machine,[

=== modified file 'storage/maria/plug.in'
--- a/storage/maria/plug.in	2009-03-13 13:18:32 +0000
+++ b/storage/maria/plug.in	2009-05-21 19:00:45 +0000
@@ -1,5 +1,5 @@
 MYSQL_STORAGE_ENGINE(maria,, [Maria Storage Engine],
-        [Crash-safe tables with MyISAM heritage], [default,max,max-no-ndb])
+        [Crash-safe tables with MyISAM heritage], [])
 MYSQL_PLUGIN_DIRECTORY(maria,  [storage/maria])
 MYSQL_PLUGIN_STATIC(maria,     [libmaria.a])
 # We want to allow --without-maria-storage-engine => not mandatory.


Attachment: [text/bzr-bundle] bzr/[e-mail]