diff --git a/addons/mysql/reloader/update-parameter.sh b/addons/mysql/reloader/update-parameter.sh index 9acf85192..c1fa55591 100644 --- a/addons/mysql/reloader/update-parameter.sh +++ b/addons/mysql/reloader/update-parameter.sh @@ -1,16 +1,15 @@ -#!/bin/sh -set -e +#!/bin/bash function mysql_exec() { local query="$1" - mysql --user=${MYSQL_ADMIN_USER} --password=${MYSQL_ADMIN_PASSWORD} --host=127.0.0.1 -P 3306 -NBe "${query}" + mysql --user="${MYSQL_ADMIN_USER}" --password="${MYSQL_ADMIN_PASSWORD}" --host=127.0.0.1 -P 3306 -NBe "${query}" } paramName="${1:?missing param name}" paramValue="${2:?missing value}" if echo "${paramName}" | grep -q "^loose_"; then - paramName=$(echo "${paramName}" | sed 's/^loose_//') + paramName=${paramName//"loose_"/} fi paramName=$(echo "${paramName}" | tr '-' '_') @@ -18,7 +17,7 @@ var_int=-1 if [[ "${paramValue}" =~ ^[0-9]+$ ]]; then var_int="${paramValue}" fi -if [ ${var_int} -lt 0 ]; then +if [ "${var_int}" -lt 0 ]; then if [[ "${paramValue}" =~ ^([0-9]+)(K|KB|k|kb)$ ]]; then number="${BASH_REMATCH[1]}" var_int=$((number * 1024)) @@ -31,9 +30,11 @@ if [ ${var_int} -lt 0 ]; then fi fi -if [ ${var_int} -ge 0 ]; then - mysql_exec "SET GLOBAL ${paramName} = ${var_int};" +if [ "${var_int}" -ge 0 ]; then + ret=$(mysql_exec "SET GLOBAL ${paramName} = ${var_int};" 2>&1) else - mysql_exec "SET GLOBAL ${paramName} = '${paramValue}';" + ret=$(mysql_exec "SET GLOBAL ${paramName} = '${paramValue}';" 2>&1) fi +echo "Set parameter ${paramName} to value ${paramValue}, result: ${ret}" +