From e13867f7c9a2d0d980349abb13ee05d42f8a50db Mon Sep 17 00:00:00 2001 From: mmetc <92726601+mmetc@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:25:57 +0200 Subject: [PATCH] fix --column-statistics handling in mysql tests (#1680) --- tests/lib/db/instance-mysql | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/lib/db/instance-mysql b/tests/lib/db/instance-mysql index e908b6e45..6b40c84ac 100755 --- a/tests/lib/db/instance-mysql +++ b/tests/lib/db/instance-mysql @@ -51,19 +51,14 @@ setup() { dump() { backup_file="${1?Missing file to backup database to}" - COLUMN_STATISTICS= - if mysqldump --column-statistics 2>&1 | grep -q -v 'unknown option'; then - COLUMN_STATISTICS='--column-statistics=0' - fi - silence_password_warning \ - mysqldump \ - "${COLUMN_STATISTICS}" \ - "--host=${MYSQL_HOST}" \ - "--port=${MYSQL_PORT}" \ - "--user=${MYSQL_USER}" \ - "--password=${MYSQL_PASSWORD}" \ - --databases crowdsec_test > "${backup_file}" + args=(mysqldump) + if mysqldump --column-statistics 2>&1 | grep -q -v 'unknown option'; then + args+=("--column-statistics=0") + fi + args+=("--host=${MYSQL_HOST}" "--port=${MYSQL_PORT}" "--user=${MYSQL_USER}" "--password=${MYSQL_PASSWORD}" --databases crowdsec_test) + + silence_password_warning "${args[@]}" > "${backup_file}" } restore() {