database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Remove --upgrade-info option from mysql_upgrade

Browse Source 
Removed the option as it safe to always create the file when we have
created the MariaDB data directories. This fixes this issue not only
for debian but for all MariaDB users.
This commit is contained in:
Monty
2022-01-27 14:51:16 +02:00
parent 93a5fb0025
commit 5acc79d030
3 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysql_install_db.sh
View File

@ -42,7 +42,6 @@ create database if not exists test;
use mysql;"
auth_root_authentication_method=normal
auth_root_socket_user='root'
upgrade_info=0
dirname0=`dirname $0 2>/dev/null`
dirname0=`dirname $dirname0 2>/dev/null`
@ -104,7 +103,6 @@ Usage: $0 [OPTIONS]
group. You must be root to use this option. By default
mysqld runs using your current group and files and
directories that it creates will be owned by you.
--upgrade-info Store mysql_upgrade_info in the installed data directory.
All other options are passed to the mysqld program
@ -160,7 +158,6 @@ parse_arguments()
--skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ; silent_startup="" ;;
--rpm) in_rpm=1 ;;
--upgrade-info) upgrade_info=1 ;;
--help) usage ;;
--no-defaults|--defaults-file=*|--defaults-extra-file=*)
defaults="$arg" ;;
@ -528,10 +525,7 @@ SET @auth_root_socket='$auth_root_socket_user';" ;;
esac
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
if test "$upgrade_info" -eq 1
then
printf "@VERSION@-MariaDB" > "$ldata/mysql_upgrade_info"
fi
s_echo "OK"
else
echo