Merge branch 'issue/BUG34675508' into release/8.0.32

oscpache · oscpache · commit adbec2297469 · 2022-10-21T14:04:46.000-05:00
Change-Id: I91af7ba9904fbfde5100794de92b65f9c79c66bb
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -15,6 +15,7 @@ v8.0.32
 - WL#15036: Support for type hints
 - BUG#34710366: Django implementation does not pass unit tests
 - BUG#34689812: Fix datetime conversion when using prepared cursors
+- BUG#34675508: Character set 'utf8' unsupported in python mysql connector when using MariaDB
 - BUG#34556157: Kerberos authorization fails when using SSPI as security interface
 - BUG#34499578: MySQLCursor.executemany() fails to correctly identify BULK data loading ops
 - BUG#30089671: Fix decoding VARBINARY columns when using a prepared cursor
diff --git a/lib/mysql/connector/constants.py b/lib/mysql/connector/constants.py
@@ -679,8 +679,9 @@ class CharacterSet(_Constants):
     name of the used character set or collation.
     """
 
-    desc: List[Optional[Tuple[str, str, bool]]] = MYSQL_CHARACTER_SETS  # type: ignore[assignment]
-    mysql_version: Tuple[int, ...] = (8, 0)
+    # Use LTS character set as default
+    desc: List[Optional[Tuple[str, str, bool]]] = MYSQL_CHARACTER_SETS_57  # type: ignore[assignment]
+    mysql_version: Tuple[int, ...] = (5, 7)
 
     # Multi-byte character sets which use 5c (backslash) in characters
     slash_charsets: Tuple[int, ...] = (1, 13, 28, 84, 87, 88)
@@ -693,8 +694,8 @@ def set_mysql_version(cls, version: Tuple[int, ...]) -> None:
             version (tuple): MySQL version tuple.
         """
         cls.mysql_version = version[:2]
-        if cls.mysql_version == (5, 7):
-            cls.desc = MYSQL_CHARACTER_SETS_57
+        if cls.mysql_version == (8, 0):
+            cls.desc = MYSQL_CHARACTER_SETS
 
     @classmethod
     def get_info(cls, setid: int) -> Tuple[str, str]:
