diff --git a/patches/patch20151022-0/patch.sh b/patches/patch20151022-0/patch.sh index 0f529792f8078c51681972e8aec6852d7621fb2d..7952afe1badf709095cb29e0df43091c31df433c 100755 --- a/patches/patch20151022-0/patch.sh +++ b/patches/patch20151022-0/patch.sh @@ -35,7 +35,7 @@ fi check_version $OLD_VERSION function addIdx { - $CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE $1 ADD COLUMN pidx TINYINT UNSIGNED NOT NULL DEFAULT 0;" + $MYSQL_CMD $MYSQL_CONNECTION -D $DATABASE -e "ALTER TABLE $1 ADD COLUMN pidx TINYINT UNSIGNED NOT NULL DEFAULT 0;" } addIdx "reference_data" diff --git a/patches/utils/patch_header.sh b/patches/utils/patch_header.sh index 7cb477b93f635679f8fdf529623fa36663e49eaa..0a425b807be57cdeadd77e8b9db331d6e00916e0 100644 --- a/patches/utils/patch_header.sh +++ b/patches/utils/patch_header.sh @@ -22,7 +22,6 @@ # ** end header # #header for patch scripts -CMD_MYSQL=mysql CMD_MYSQL_DUMP=mysqldump USAGE="$1 [ --env=ENV_FILE ] [ --patch=PATCH ] [ --backupdir=BACKUPDIR ]\n\n" CMD_OPTIONS=cat <<EOF @@ -148,7 +147,7 @@ function uptodate { # @param $1: db version string, e.g. v2.0.0 # @return: 0 on success, 1 on failure function check_version { - local version=$($CMD_MYSQL $MYSQL_CONNECTION -B -e "Select CaosDBVersion();") + local version=$($MYSQL_CMD $MYSQL_CONNECTION -B -e "Select CaosDBVersion();") if [[ "$(echo $version | sed 's/^CaosDBVersion()\s//')" = "$1" ]]; then return 0 fi @@ -168,7 +167,7 @@ function dump_table { function mysql_execute { set +e - $CMD_MYSQL $MYSQL_CONNECTION -e "$1" + $MYSQL_CMD $MYSQL_CONNECTION -e "$1" ret=${PIPESTATUS[0]} if [ "$ret" -ne 0 ]; then failure "MYSQL ERROR" @@ -177,6 +176,6 @@ function mysql_execute { } function redo_table { - $CMD_MYSQL $MYSQL_CONNECTION < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql + $MYSQL_CMD $MYSQL_CONNECTION < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql }