Hi Otto, this is the commit
/Georg git show 29720950eeae75f1ea7ef1376a6149cabeb79d13 commit 29720950eeae75f1ea7ef1376a6149cabeb79d13 Author: Georg Richter <ge...@mariadb.com> Date: Wed Sep 30 06:29:29 2020 +0200 Allow to specify the default character set in server builds with -DCONC_DEFAULT_CHARSET diff --git a/CMakeLists.txt b/CMakeLists.txt index c85baf2..4045491 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY) SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES) FOREACH(V WITH_MYSQLCOMPAT WITH_MSI WITH_SIGNCODE WITH_RTC WITH_UNIT_TESTS WITH_DYNCOL WITH_EXTERNAL_ZLIB WITH_CURL WITH_SQLITE WITH_SSL WITH_ICONV - INSTALL_LAYOUT WITH_TEST_SRCPKG) + DEFAULT_CHARSET INSTALL_LAYOUT WITH_TEST_SRCPKG) SET(${V} ${${OPT}${V}}) ENDFOREACH() On Tue, Oct 6, 2020 at 11:49 AM Otto Kekäläinen <o...@debian.org> wrote: > Hello Georg! > > Will you do this same `-DCONC_DEFAULT_CHARSET=utf8mb4` change upstream > as I did in > https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/ca5e93c754209f9c1a729bb057332ab3b0b76363 > ? > > Let me know if there is an upstream commit so I can document it in > > https://salsa.debian.org/mariadb-team/mariadb-10.5/-/blob/master/debian/patches/933063-client-utf8mb4-by-default.patch > and easily drop it once that upstream commit is eventually imported > into Debian. > > su 4. lokak. 2020 klo 12.39 Otto Kekäläinen (o...@debian.org) kirjoitti: > > > > Thanks! > > > > I confirm the patch from Georg fixes this and the result looks like: > > > > g++ b933063.cpp -l mariadbclient && ./a.out > > character_set_client: utf8mb4 > > character_set_connection: utf8mb4 > > character_set_database: utf8mb4 > > character_set_filesystem: binary > > character_set_results: utf8mb4 > > character_set_server: utf8mb4 > > character_set_system: utf8 > > character_sets_dir: /usr/share/mysql/charsets/ > > spider_remote_access_charset: > > spider_use_table_charset: -1 > > > > > > I also extended Salsa-CI to automatically test for this so that this > > simple client library linking build does not regress unnoticed: > > > https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commits/bugfix/933063-default-client-charset-utf8mb4 > > > > Open > https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/3c62617cf955ece894504e88a72b3ce207635d05 > > to view the changes. > > > > > > Georg: Will you do this same `-DCONC_DEFAULT_CHARSET=utf8mb4` change > upstream? > > > -- Georg Richter, Senior Software Engineer MariaDB Corporation Ab