Only treat CHAR(n) columns as Guids. Fixes #1565

This reverts a change in #1546 that was introduced to fix #1528. However, none of the integration tests fail locally when reverting this change, so it's not clear why it was necessary.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

src/MySqlConnector/ColumnReaders/ColumnReader.cs

@@ -45,13 +45,13 @@ public static ColumnReader Create(bool isBinary, ColumnDefinitionPayload columnD
 				return BitColumnReader.Instance;
 
 			case ColumnType.String:
-			case ColumnType.VarString:
 				if (connection.GuidFormat == MySqlGuidFormat.Char36 && columnDefinition.ColumnLength / ProtocolUtility.GetBytesPerCharacter(columnDefinition.CharacterSet) == 36)
 					return GuidChar36ColumnReader.Instance;
 				if (connection.GuidFormat == MySqlGuidFormat.Char32 && columnDefinition.ColumnLength / ProtocolUtility.GetBytesPerCharacter(columnDefinition.CharacterSet) == 32)
 					return GuidChar32ColumnReader.Instance;
-				goto case ColumnType.VarChar;
+				goto case ColumnType.VarString;
 
+			case ColumnType.VarString:
 			case ColumnType.VarChar:
 			case ColumnType.TinyBlob:
 			case ColumnType.Blob: