summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2005-09-02 16:01:26 -0700
committerunknown <brian@zim.(none)>2005-09-02 16:01:26 -0700
commit824c6cf9c30fd555c0a7e52b6de3cf63432f24d9 (patch)
treef2ae447f294c7f4db9955ef32fc13a18429b492f
parent9ea1d5e293a0a12b1be1d305d1a88e2aae18a4ba (diff)
downloadmariadb-git-824c6cf9c30fd555c0a7e52b6de3cf63432f24d9.tar.gz
Fixed partition push so that it now compiles. The sinclude directory was not added which means that though the code was in the tree, it never actually compiled. I did make sure that it compiles, but there are no tests to really test functionality at this point.
BUILD/SETUP.sh: Added partition engine to default max builds. config/ac-macros/ha_partition.m4: Fixed spacing issue configure.in: Added sinclude for partition rules
-rwxr-xr-xBUILD/SETUP.sh4
-rw-r--r--config/ac-macros/ha_partition.m42
-rw-r--r--configure.in1
3 files changed, 4 insertions, 3 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 1603cfadbed..398a2bbbfd6 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -48,8 +48,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
c_warnings="$global_warnings -Wunused"
cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
-base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine"
-max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables"
+base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-partition"
+max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-openssl --with-embedded-server --with-big-tables --with-partition"
max_configs="$base_max_configs --with-embedded-server"
path=`dirname $0`
diff --git a/config/ac-macros/ha_partition.m4 b/config/ac-macros/ha_partition.m4
index 1cfb5135771..ddec98530ce 100644
--- a/config/ac-macros/ha_partition.m4
+++ b/config/ac-macros/ha_partition.m4
@@ -6,7 +6,7 @@ AC_DEFUN([MYSQL_CHECK_PARTITIONDB], [
AC_ARG_WITH([partition],
[
--with-partition
- Enable the Partition Storage Engine],
+ Enable the Partition Storage Engine],
[partitiondb="$withval"],
[partitiondb=no])
AC_MSG_CHECKING([for partition])
diff --git a/configure.in b/configure.in
index a0a394acaa0..06764f63760 100644
--- a/configure.in
+++ b/configure.in
@@ -43,6 +43,7 @@ sinclude(config/ac-macros/ha_example.m4)
sinclude(config/ac-macros/ha_federated.m4)
sinclude(config/ac-macros/ha_innodb.m4)
sinclude(config/ac-macros/ha_ndbcluster.m4)
+sinclude(config/ac-macros/ha_partition.m4)
sinclude(config/ac-macros/ha_tina.m4)
sinclude(config/ac-macros/large_file.m4)
sinclude(config/ac-macros/misc.m4)