From 16c3f5c816749cbc8e18915419a3aec76866b165 Mon Sep 17 00:00:00 2001 From: mumingl <73567153+mumingl@users.noreply.github.com> Date: Tue, 23 Jun 2026 16:25:02 +0800 Subject: [PATCH] fix: Resolve inconsistent usage of error variables (#10060) * fix: Resolve inconsistent usage of error variables * mysql2: guard nil DB on open failure and wrap connect error --------- Co-authored-by: muminglei Co-authored-by: Chris Lu --- weed/filer/mysql2/mysql2_store.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/weed/filer/mysql2/mysql2_store.go b/weed/filer/mysql2/mysql2_store.go index d1f13b9ae..b4845ec07 100644 --- a/weed/filer/mysql2/mysql2_store.go +++ b/weed/filer/mysql2/mysql2_store.go @@ -80,9 +80,11 @@ func (store *MysqlStore2) initialize(createTable, upsertQuery string, enableUpse var dbErr error store.DB, dbErr = sql.Open("mysql", sqlUrl) if dbErr != nil { - store.DB.Close() + if store.DB != nil { + store.DB.Close() + } store.DB = nil - return fmt.Errorf("can not connect to %s error:%v", adaptedSqlUrl, err) + return fmt.Errorf("can not connect to %s error:%w", adaptedSqlUrl, dbErr) } store.DB.SetMaxIdleConns(maxIdle)