1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/mariadb-server-10.2.postinst vendored
View File

@ -144,7 +144,7 @@ EOF
# Debian: beware of the bashisms... # Debian: beware of the bashisms...
# Debian: can safely run on upgrades with existing databases # Debian: can safely run on upgrades with existing databases
set +e set +e
bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin --upgrade-info 2>&1 | $ERR_LOGGER bash /usr/bin/mysql_install_db --rpm --cross-bootstrap --user=mysql --disable-log-bin 2>&1 | $ERR_LOGGER
set -e set -e
## On every reconfiguration the maintenance user is recreated. ## On every reconfiguration the maintenance user is recreated.

15
man/mysql_install_db.1
View File

@ -276,21 +276,6 @@ This must be given as the first argument\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
.\" mysql_install_db: upgrade-info option
.\" upgrade-info option: mysql_install_db
\fB\-\-upgrade\-info\fR
.sp
This places a mysql_upgrade_info file containing the server version in the data directory\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
.\" mysql_install_db: rpm option .\" mysql_install_db: rpm option
.\" rpm option: mysql_install_db .\" rpm option: mysql_install_db
\fB\-\-rpm\fR \fB\-\-rpm\fR

6
scripts/mysql_install_db.sh
View File

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