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