[debian-mysql] Bug#933063: Bug#933063: character_set_client: latin1?

[Otto Kekäläinen]

Tested this patch, unfortunately it didn't work:


MariaDB [(none)]> status;
--------------
mariadb  Ver 15.1 Distrib 10.5.5-MariaDB, for debian-linux-gnu
(x86_64) using readline 5.2

Connection id: 45
Current database:
Current user: root at localhost
SSL: Not in use
Current pager: stdout
Using outfile: ''
Using delimiter: ;
Server: MariaDB
Server version: 10.5.5-MariaDB-2-debug Debian unstable
Protocol version: 10
Connection: Localhost via UNIX socket
Server characterset: utf8mb4
Db     characterset: utf8mb4
Client characterset: latin1
Conn.  characterset: latin1


commit 2e1239cd426dd6bb910363082f57d66c06f71254
Author: Otto Kekäläinen <otto at debian.org>
Date:   Tue Sep 29 21:27:02 2020 +0300

    Use build flag to enforce default charset as utf8mb4 (Closes: #933063)

diff --git a/debian/patches/933063-client-utf8mb4-by-default.patch
b/debian/patches/933063-client-utf8mb4-by-default.patch
new file mode 100644
index 000000000..573dcf2f7
--- /dev/null
+++ b/debian/patches/933063-client-utf8mb4-by-default.patch
@@ -0,0 +1,14 @@
+Author: Georg Richter <georg at mariadb.com>
+  Looks like it was forgotten to add this option when building C/C as
a sunproject inside server. I fixed that now:
+
+--- a/libmariadb/CMakeLists.txt
++++ b/libmariadb/CMakeLists.txt
+@@ -25,7 +25,7 @@ get_directory_property(IS_SUBPROJECT PAR
+ 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
+-    INSTALL_LAYOUT WITH_TEST_SRCPKG)
++    DEFAULT_CHARSET INSTALL_LAYOUT WITH_TEST_SRCPKG)
+   SET(${V} ${${OPT}${V}})
+ ENDFOREACH()
+
diff --git a/debian/patches/series b/debian/patches/series
index 043ed42cf..81eef0cdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ prevent-executable-stack-due-to-objects-compiled-fro.patch
 env-perl-usr-bin-perl.patch
 fix-spelling.patch
 ftbfs-x32.patch
+933063-client-utf8mb4-by-default.patch
diff --git a/debian/rules b/debian/rules
index 819ac6ea0..3809e8f54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,6 +101,7 @@ endif
            -DSYSTEM_TYPE="debian-$(DEB_HOST_GNU_SYSTEM)" \
            -DBUILD_CONFIG=mysql_release \
            -DWITH_SSL=bundled \
+           -DCONC_DEFAULT_CHARSET=utf8mb4 \
            -DPLUGIN_TOKUDB=NO \
            -DPLUGIN_CASSANDRA=NO \
            -DPLUGIN_AWS_KEY_MANAGEMENT=NO \