collations: fix coercion semantics according to 8.0.31 changes (vites…

…sio#11487) (vitessio#11836) Signed-off-by: Vicent Marti <[email protected]> Signed-off-by: Vicent Marti <[email protected]> Signed-off-by: Florent Poinsard <[email protected]> Co-authored-by: Florent Poinsard <[email protected]> Signed-off-by: Manan Gupta <[email protected]> Signed-off-by: Vicent Marti <[email protected]> Signed-off-by: Florent Poinsard <[email protected]> Signed-off-by: Manan Gupta <[email protected]> Co-authored-by: Vicent Martí <[email protected]> Co-authored-by: Florent Poinsard <[email protected]>
rohit-nayak-ps · Nov 29, 2022 · f55765c · f55765c
1 parent 9d2f752
commit f55765c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/go/mysql/collations/coercion.go b/go/mysql/collations/coercion.go
@@ -208,9 +208,16 @@ func (env *Environment) MergeCollations(left, right TypedCollation, opt Coercion
 	if leftColl == nil || rightColl == nil {
 		return TypedCollation{}, nil, nil, fmt.Errorf("unsupported TypeCollationID: %v / %v", left.Collation, right.Collation)
 	}
+
 	leftCS := leftColl.Charset()
 	rightCS := rightColl.Charset()
 
+	if left.Coercibility == CoerceExplicit && right.Coercibility == CoerceExplicit {
+		if left.Collation != right.Collation {
+			goto cannotCoerce
+		}
+	}
+
 	if leftCS.Name() == rightCS.Name() {
 		switch {
 		case left.Coercibility < right.Coercibility:

diff --git a/go/mysql/collations/integration/coercion_test.go b/go/mysql/collations/integration/coercion_test.go
@@ -135,8 +135,8 @@ func TestComparisonSemantics(t *testing.T) {
 	conn := mysqlconn(t)
 	defer conn.Close()
 
-	if strings.HasPrefix(conn.ServerVersion, "8.0.31") {
-		t.Skipf("Coercion semantics have changed in 8.0.31")
+	if v, err := conn.ServerVersionAtLeast(8, 0, 31); err != nil || !v {
+		t.Skipf("The behavior of Coercion Semantics is not correct before 8.0.31")
 	}
 
 	for _, coll := range collations.Local().AllCollations() {