From 64715ae8b0da07cb4682b8c7ac7d0e3d6f4e499d Mon Sep 17 00:00:00 2001 From: Alex Tymchuk Date: Wed, 30 Aug 2023 22:00:07 +0000 Subject: [PATCH] PMM-12375 use a different syntax for checking the version --- agent/connectionchecker/connection_checker.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/agent/connectionchecker/connection_checker.go b/agent/connectionchecker/connection_checker.go index 1981575226..0a0d0125db 100644 --- a/agent/connectionchecker/connection_checker.go +++ b/agent/connectionchecker/connection_checker.go @@ -290,16 +290,10 @@ func (cc *ConnectionChecker) checkProxySQLConnection(ctx context.Context, dsn st } var version string - if err := db.QueryRowContext( - ctx, - "SELECT /* agent='connectionchecker' */ variable_value FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name = 'admin-version'").Scan(&version); err != nil { - err := db.QueryRowContext( - ctx, - "SELECT /* agent='connectionchecker' */ variable_value FROM PERFORMANCE_SCHEMA.GLOBAL_VARIABLES WHERE variable_name = 'admin-version'").Scan(&version) - if err != nil { - res.Error = err.Error() - return &res - } + //nolint:lll + if err := db.QueryRowContext(ctx, "SELECT /* agent='connectionchecker' */ @@GLOBAL.admin-version").Scan(&version); err != nil { + res.Error = err.Error() + return &res } res.Stats = &agentpb.CheckConnectionResponse_Stats{