diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
| commit | 8cbb14ef5d180687f131bc44a4e8fc84083d033c (patch) | |
| tree | 091f11e2d20f95656a7b12294782eb0488fd4fcc /scripts | |
| parent | 4345868382ca3525de5eb432302b6b9b957b47c1 (diff) | |
| parent | b85aa20065504bdda4bc03c2bd7eb7de38865c5d (diff) | |
| download | mariadb-git-8cbb14ef5d180687f131bc44a4e8fc84083d033c.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/maria_add_gis_sp.sql.in | 4 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/scripts/maria_add_gis_sp.sql.in b/scripts/maria_add_gis_sp.sql.in index 3a5dd49b95b..5826cc1a038 100644 --- a/scripts/maria_add_gis_sp.sql.in +++ b/scripts/maria_add_gis_sp.sql.in @@ -24,12 +24,12 @@ DROP PROCEDURE IF EXISTS AddGeometryColumn; DROP PROCEDURE IF EXISTS DropGeometryColumn; CREATE DEFINER=`root`@`localhost` PROCEDURE AddGeometryColumn(catalog varchar(64), t_schema varchar(64), - t_name varchar(64), geometry_column varchar(64), t_srid int) + t_name varchar(64), geometry_column varchar(64), t_srid int) SQL SECURITY INVOKER begin set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' ADD ', geometry_column,' GEOMETRY REF_SYSTEM_ID=', t_srid); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end @ADD_GIS_SP_EOL@ CREATE DEFINER=`root`@`localhost` PROCEDURE DropGeometryColumn(catalog varchar(64), t_schema varchar(64), - t_name varchar(64), geometry_column varchar(64)) + t_name varchar(64), geometry_column varchar(64)) SQL SECURITY INVOKER begin set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' DROP ', geometry_column); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end @ADD_GIS_SP_EOL@ diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 8bad8c4000b..2c132cccf2a 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -36,7 +36,9 @@ force=0 in_rpm=0 ip_only=0 cross_bootstrap=0 -install_params="" +install_params="create database if not exists mysql; +create database if not exists test; +use mysql;" auth_root_authentication_method=normal auth_root_socket_user='root' @@ -436,7 +438,7 @@ then fi # Create database directories -for dir in "$ldata" "$ldata/mysql" "$ldata/test" +for dir in "$ldata" do if test ! -d "$dir" then @@ -499,7 +501,7 @@ SET @auth_root_socket=NULL;" ;; SET @skip_auth_root_nopasswd=1; SET @auth_root_socket='$auth_root_socket_user';" ;; esac -if { echo "use mysql;$install_params"; cat "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$fill_help_tables" "$maria_add_gis_sp"; } | eval "$filter_cmd_line" | mysqld_install_cmd_line > /dev/null +if { echo "$install_params"; cat "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$fill_help_tables" "$maria_add_gis_sp"; } | eval "$filter_cmd_line" | mysqld_install_cmd_line > /dev/null then s_echo "OK" else |