diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-11-22 12:34:10 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-12-15 19:13:57 +0100 |
| commit | a4fc41b6b48a1e699343c20685a0e221002eba43 (patch) | |
| tree | 1f7d69a234c6839e07626d794fb375ceab5bec2c | |
| parent | ba9d231b5ab75bc3614e53bdd95026e5fe9dd565 (diff) | |
| download | mariadb-git-a4fc41b6b48a1e699343c20685a0e221002eba43.tar.gz | |
MDEV-26713 Treat codepage 65001 as utf8mb4, not utf8mb3
Also, fix the "UTF8" option in MSI, which is responsible for character-set-server
setting
| -rw-r--r-- | mysys/charset.c | 2 | ||||
| -rw-r--r-- | win/packaging/extra.wxs.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 2a8ac6e1ca5..326fea26f1a 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -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 */ diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 11fe60719ec..dd76cc816f5 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -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) --> |