Get rid of unused commented code lines.

This commit is contained in:
Christoph 2020-09-01 14:38:28 +02:00
parent 2d761934d4
commit 09bda7f950
2 changed files with 0 additions and 104 deletions

View File

@ -648,58 +648,6 @@ if [[ $? -ne 0 ]] ; then
else else
echo_ok echo_ok
fi fi
#if [[ "$MYSQL_CUR_DISTRIBUTION" = "MariaDB" ]] ; then
#
# echononl " Grant usage to user '$DATABASE_USER' (Creates User..)"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT USAGE ON *.* TO '$DATABASE_USER'@'localhost' IDENTIFIED BY '$DATABASE_PASSWD'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# echononl " Grant all privileges to user '$DATABASE_USER' on Database '$DATABASE_NAME'"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT ALL PRIVILEGES ON ${DATABASE_NAME}.* TO '$DATABASE_USER'@'localhost'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# if $ACCESS_FROM_OUTSIDE ; then
#
# for _ip in $IP_ADDRESSES ; do
#
# echononl " Grant usage to user '$DATABASE_USER' access from ${_ip}"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT USAGE ON *.* TO '$DATABASE_USER'@'${_ip}' IDENTIFIED BY '$DATABASE_PASSWD'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# echononl " Grant all privileges to user '$DATABASE_USER' on Database '$DATABASE_NAME' from $_ip"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT ALL PRIVILEGES ON ${DATABASE_NAME}.* TO '$DATABASE_USER'@'${_ip}'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# done
#
# fi
#
#elif [[ $MAJOR_VERSION -gt 8 ]] \
if [[ "$MYSQL_CUR_DISTRIBUTION" = "MySQL" ]] && ([[ $MAJOR_VERSION -gt 8 ]] \ if [[ "$MYSQL_CUR_DISTRIBUTION" = "MySQL" ]] && ([[ $MAJOR_VERSION -gt 8 ]] \
|| ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -gt 0 ]] ) \ || ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -gt 0 ]] ) \
|| ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -eq 0 ]] && [[ $PATCH_LEVEL -ge 3 ]] )) ; then || ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -eq 0 ]] && [[ $PATCH_LEVEL -ge 3 ]] )) ; then

View File

@ -639,58 +639,6 @@ else
fi fi
echo_ok echo_ok
#if [[ "$MYSQL_CUR_DISTRIBUTION" = "MariaDB" ]] ; then
#
# echononl " Grant usage to user '$DATABASE_USER' (Creates User..)"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT USAGE ON *.* TO '$DATABASE_USER'@'localhost' IDENTIFIED BY '$DATABASE_PASSWD'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# echononl " Grant all privileges to user '$DATABASE_USER' on Database '$DATABASE_NAME'"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT ALL PRIVILEGES ON ${DATABASE_NAME}.* TO '$DATABASE_USER'@'localhost'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# if $ACCESS_FROM_OUTSIDE ; then
#
# for _ip in $IP_ADDRESSES ; do
#
# echononl " Grant usage to user '$DATABASE_USER' access from ${_ip}"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT USAGE ON *.* TO '$DATABASE_USER'@'${_ip}' IDENTIFIED BY '$DATABASE_PASSWD'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# echononl " Grant all privileges to user '$DATABASE_USER' on Database '$DATABASE_NAME' from $_ip"
# mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \
# "GRANT ALL PRIVILEGES ON ${DATABASE_NAME}.* TO '$DATABASE_USER'@'${_ip}'" > $tmp_log_file 2>&1
# if [[ $? -ne 0 ]] ; then
# echo_failed
# error "$(cat $tmp_log_file)"
# else
# echo_ok
# fi
#
# done
#
# fi
#
#elif [[ $MAJOR_VERSION -gt 8 ]] \
if [[ "$MYSQL_CUR_DISTRIBUTION" = "MySQL" ]] && ([[ $MAJOR_VERSION -gt 8 ]] \ if [[ "$MYSQL_CUR_DISTRIBUTION" = "MySQL" ]] && ([[ $MAJOR_VERSION -gt 8 ]] \
|| ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -gt 0 ]] ) \ || ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -gt 0 ]] ) \
|| ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -eq 0 ]] && [[ $PATCH_LEVEL -ge 3 ]] )) ; then || ( [[ $MAJOR_VERSION -eq 8 ]] && [[ $MINOR_VERSION -eq 0 ]] && [[ $PATCH_LEVEL -ge 3 ]] )) ; then