WL#1163 (Make spatial code separable for other parts)

--with-geometry and
--with-embedded-privilege-control
configure switches added


acconfig.h:
  necessary lines added
myisam/mi_open.c:
  #include added
mysql-test/t/gis-rtree.test:
  test modified to take HAVE_GEOMETRY in account
mysql-test/t/gis.test:
  test modified to take HAVE_GEOMETRY in account
sql/mysql_priv.h:
  option's variables added
sql/mysqld.cc:
  option's handling added
sql/set_var.cc:
  option's descriptions added

4 files changed, 10 insertions, 0 deletions

diff --git a/mysql-test/include/have_geometry.inc b/mysql-test/include/have_geometry.inc
new file mode 100644
index 00000000000..169c3a41ee7
--- /dev/null
+++ b/mysql-test/include/have_geometry.inc
@@ -0,0 +1,4 @@
+-- require r/have_geometry.require
+disable_query_log;
+show variables like "have_geometry";
+enable_query_log;
diff --git a/mysql-test/r/have_geometry.require b/mysql-test/r/have_geometry.require
new file mode 100644
index 00000000000..ba515a4bbb6
--- /dev/null
+++ b/mysql-test/r/have_geometry.require
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_geometry	YES
diff --git a/mysql-test/t/gis-rtree.test b/mysql-test/t/gis-rtree.test
index 8e91e5891b8..817249b7e4c 100644
--- a/mysql-test/t/gis-rtree.test
+++ b/mysql-test/t/gis-rtree.test
@@ -1,3 +1,5 @@
+-- source include/have_geometry.inc
+
 #
 # test of rtree (using with spatial data)
 #
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index ea460d5f7b0..590007caba1 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -1,3 +1,5 @@
+-- source include/have_geometry.inc
+
 #
 # Spatial objects
 #