From abd5384d9b4af1dac52f5c3561926e5423f79092 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Wed, 13 Jul 2022 12:11:03 +0530 Subject: [PATCH] Clarify collation mismatch string (#20641) We replace expected/received with the source of the collation. This makes it more clear as to from where the values were retrieved. ```release-note NONE ``` --- store/sqlstore/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/sqlstore/store.go b/store/sqlstore/store.go index a0804fb4fc..b5c9550729 100644 --- a/store/sqlstore/store.go +++ b/store/sqlstore/store.go @@ -1167,7 +1167,7 @@ func (ss *SqlStore) ensureDatabaseCollation() error { } if tableCollation != connCollation.Value { - mlog.Warn("Table collation mismatch", mlog.String("table_name", tableName), mlog.String("expected", connCollation.Value), mlog.String("found", tableCollation)) + mlog.Warn("Table collation mismatch", mlog.String("table_name", tableName), mlog.String("connection_collation", connCollation.Value), mlog.String("table_collation", tableCollation)) } }