mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-26713 Treat codepage 65001 as utf8mb4, not utf8mb3

Browse source 
Also, fix the "UTF8" option in MSI, which is responsible for character-set-server
setting
This commit is contained in:
Vladislav Vaintroub 2021-11-22 12:34:10 +01:00 committed by Sergei Golubchik
parent ba9d231b5a
commit a4fc41b6b4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysys/charset.c
View file

@ -1393,7 +1393,7 @@ static const MY_CSET_OS_NAME charsets[] =
#ifdef UNCOMMENT_THIS_WHEN_WL_WL_4024_IS_DONE
{"cp54936", "gb18030", my_cs_exact},
#endif
{"cp65001", "utf8", my_cs_exact},
{"cp65001", "utf8mb4", my_cs_exact},
#else /* not Windows */

2
win/packaging/extra.wxs.in
View file

@ -461,7 +461,7 @@
Section="mysqld"
Name="my.ini"
Key="character-set-server"
Value="utf8" />
Value="utf8mb4" />
</Component>
<!-- Shortcuts in program menu (mysql client etc) -->