install_mysql.sh: Do not install Percona packages if mysql distribution is not Percona.

This commit is contained in:
Christoph 2019-11-02 02:29:55 +01:00
parent efc8cb9fc2
commit c0b888b2bf

View File

@ -1508,25 +1508,29 @@ if ! $UPDATE_MYSQL && ! $PARALLEL_INSTALLATION ; then
# -
_failed=false
echononl "Install Percona apt repository .."
echo "" >> ${logdir}/main.log
echo "## - Install Percona apt repository .." >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
echo "wget -O /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb https://repo.percona.com/apt/percona-release_0.1-5.$(lsb_release -sc)_all.deb" >> ${logdir}/main.log
wget -O /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb https://repo.percona.com/apt/percona-release_0.1-5.$(lsb_release -sc)_all.deb >> ${logdir}/main.log 2>&1
if [[ $? -ne 0 ]]; then
_failed=true
fi
echo "dpkg -i /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb" >> ${logdir}/main.log 2>&1
dpkg -i /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb >> ${logdir}/main.log 2>&1
if [[ $? -ne 0 ]]; then
_failed=true
fi
if $_failed ; then
echo_failed
install_additional_debian_packages=false
error "Install Percona apt repository failed!"
if [[ "$MYSQL_DISTRIBUTION" = "Percona" ]] ; then
echo "" >> ${logdir}/main.log
echo "## - Install Percona apt repository .." >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
echo "wget -O /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb https://repo.percona.com/apt/percona-release_0.1-5.$(lsb_release -sc)_all.deb" >> ${logdir}/main.log
wget -O /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb https://repo.percona.com/apt/percona-release_0.1-5.$(lsb_release -sc)_all.deb >> ${logdir}/main.log 2>&1
if [[ $? -ne 0 ]]; then
_failed=true
fi
echo "dpkg -i /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb" >> ${logdir}/main.log 2>&1
dpkg -i /tmp/percona-release_0.1-5.$(lsb_release -sc)_all.deb >> ${logdir}/main.log 2>&1
if [[ $? -ne 0 ]]; then
_failed=true
fi
if $_failed ; then
echo_failed
install_additional_debian_packages=false
error "Install Percona apt repository failed!"
else
echo_ok
fi
else
echo_ok
echo_skipped
fi
@ -4209,6 +4213,12 @@ innodb-file-per-table = 1
## -
## - Default: 8388608 (8M)
## -
## - Note !!
## - innodb_additional_mem_pool_size is deprected since version 5.6.3
## - innodb_additional_mem_pool_size is removed since version 5.7
## -
## - innodb_additional_mem_pool_size is also removed on MariaDB 10.3.x
## -
#innodb-additional-mem-pool-size = 20M
#innodb-additional-mem-pool-size = 40M