summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2015-03-17 14:44:59 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2015-03-17 14:44:59 +0400
commit015994f226cfa94e6d339fdc0de670a054f631b4 (patch)
treeb577b6af0805ea5c6e847bbf21cd9334a910cc6a /scripts/mysql_install_db.sh
parentccc7297fe94af1129c717f91d31fa075d54a0371 (diff)
downloadmariadb-git-015994f226cfa94e6d339fdc0de670a054f631b4.tar.gz
MDEV-7515 GIS: No AddGeometryColumn or DropGeometryColumn in the tree.
Installation scripts added to setup the required SP-s with the mysql_install_db.
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r--scripts/mysql_install_db.sh14
1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index cce9623962d..15750ff5e90 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -307,8 +307,9 @@ fill_help_tables="$pkgdatadir/fill_help_tables.sql"
create_system_tables="$pkgdatadir/mysql_system_tables.sql"
create_system_tables2="$pkgdatadir/mysql_performance_tables.sql"
fill_system_tables="$pkgdatadir/mysql_system_tables_data.sql"
+maria_add_gis_sp="$pkgdatadir/maria_add_gis_sp_bootstrap.sql"
-for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables"
+for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp"
do
if test ! -f "$f"
then
@@ -469,6 +470,17 @@ else
echo "The \"HELP\" command might not work properly."
fi
+s_echo "Creating OpenGIS required SP-s..."
+if { echo "use test;"; cat "$maria_add_gis_sp"; } | mysqld_install_cmd_line > /dev/null
+then
+ s_echo "OK"
+else
+ echo
+ echo "WARNING: OPENGIS REQUIRED SP-S WERE NOT COMPLETELY INSTALLED!"
+ echo "GIS extentions might not work properly."
+fi
+
+
# Don't output verbose information if running inside bootstrap or using
# --srcdir for testing. In such cases, there's no end user looking at
# the screen.