Commit 60ad3398 authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-8437 - plugin variables conflict with bootstrap

There is no strong need to change password column: the only side effect is
that 4.0 -> 10.1 upgrades may get root/debian-sys-maint passwords stored in old
format. This should be perfectly acceptable, since all password at this point
are stored in old format.
parent 8e40f9b7
......@@ -191,10 +191,6 @@ EOF
chown 0:0 $dc
chmod 0600 $dc
# update privilege tables
password_column_fix_query=`/bin/echo -e \
"USE mysql;\n" \
"ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL;"`
replace_query=`/bin/echo -e \
"USE mysql;\n" \
"SET sql_mode='';\n" \
......@@ -210,9 +206,6 @@ EOF
" Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\
" ssl_cipher='', x509_issuer='', x509_subject='';"`;
# Upgrade password column format before the root password gets set.
echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
db_get mysql-server/root_password && rootpw="$RET"
if ! set_mysql_rootpw; then
password_error="yes"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment