mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-9297 - mysql_install_db launches mysqld 3x
Perform database installation in one mysqld run. This makes mysql_install_db 3x faster.
This commit is contained in:
@ -427,7 +427,7 @@ mysqld_install_cmd_line()
|
|||||||
|
|
||||||
# Create the system and help tables by passing them to "mysqld --bootstrap"
|
# Create the system and help tables by passing them to "mysqld --bootstrap"
|
||||||
s_echo "Installing MariaDB/MySQL system tables in '$ldata' ..."
|
s_echo "Installing MariaDB/MySQL system tables in '$ldata' ..."
|
||||||
if { echo "use mysql;"; cat "$create_system_tables" "$create_system_tables2" "$fill_system_tables"; } | eval "$filter_cmd_line" | mysqld_install_cmd_line > /dev/null
|
if { echo "use mysql;"; 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
|
then
|
||||||
s_echo "OK"
|
s_echo "OK"
|
||||||
else
|
else
|
||||||
@ -462,26 +462,6 @@ else
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
s_echo "Filling help tables..."
|
|
||||||
if { echo "use mysql;"; cat "$fill_help_tables"; } | mysqld_install_cmd_line > /dev/null
|
|
||||||
then
|
|
||||||
s_echo "OK"
|
|
||||||
else
|
|
||||||
echo
|
|
||||||
echo "WARNING: HELP FILES ARE NOT COMPLETELY INSTALLED!"
|
|
||||||
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
|
# Don't output verbose information if running inside bootstrap or using
|
||||||
# --srcdir for testing. In such cases, there's no end user looking at
|
# --srcdir for testing. In such cases, there's no end user looking at
|
||||||
|
Reference in New Issue
Block a user