Commit a4fc41b6 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub Committed by Sergei Golubchik

MDEV-26713 Treat codepage 65001 as utf8mb4, not utf8mb3

Also, fix the "UTF8" option in MSI, which is responsible for character-set-server
setting
parent ba9d231b
...@@ -1393,7 +1393,7 @@ static const MY_CSET_OS_NAME charsets[] = ...@@ -1393,7 +1393,7 @@ static const MY_CSET_OS_NAME charsets[] =
#ifdef UNCOMMENT_THIS_WHEN_WL_WL_4024_IS_DONE #ifdef UNCOMMENT_THIS_WHEN_WL_WL_4024_IS_DONE
{"cp54936", "gb18030", my_cs_exact}, {"cp54936", "gb18030", my_cs_exact},
#endif #endif
{"cp65001", "utf8", my_cs_exact}, {"cp65001", "utf8mb4", my_cs_exact},
#else /* not Windows */ #else /* not Windows */
......
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
Section="mysqld" Section="mysqld"
Name="my.ini" Name="my.ini"
Key="character-set-server" Key="character-set-server"
Value="utf8" /> Value="utf8mb4" />
</Component> </Component>
<!-- Shortcuts in program menu (mysql client etc) --> <!-- Shortcuts in program menu (mysql client etc) -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment