PMM-12375 use Exec to select a database

percona · Aug 30, 2023 · 7865feb · 7865feb
1 parent f58949e
commit 7865feb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/agent/connectionchecker/connection_checker.go b/agent/connectionchecker/connection_checker.go
@@ -289,10 +289,15 @@ func (cc *ConnectionChecker) checkProxySQLConnection(ctx context.Context, dsn st
 		res.Error = err.Error()
 	}
 
+	if _, err := db.ExecContext(ctx, "USE mysql"); err != nil {
+		res.Error = err.Error()
+		return &res
+	}
+
 	var version string
 	if err := db.QueryRowContext(
 		ctx,
-		"USE mysql; SELECT /* agent='connectionchecker' */ variable_value FROM global_variables WHERE variable_name = 'admin-version'").Scan(&version); err != nil { //nolint:lll
+		"SELECT /* agent='connectionchecker' */ variable_value FROM global_variables WHERE variable_name = 'admin-version'").Scan(&version); err != nil { //nolint:lll
 		res.Error = err.Error()
 		return &res
 	}

diff --git a/managed/models/database.go b/managed/models/database.go
@@ -917,7 +917,7 @@ var databaseSchema = [][]string{
 	},
 	85: {
 		`ALTER TABLE services
-		ADD COLUMN version VARCHAR`,
+		ADD COLUMN version VARCHAR NOT NULL DEFAULT ''`,
 	},
 }