From 465ff35cc2e8cf059379816dadd8bc94c801d765 Mon Sep 17 00:00:00 2001
From: Rahim Kanji <rahim.kanji@outlook.com>
Date: Thu, 28 Dec 2023 12:42:15 +0500
Subject: [PATCH] Few fixes

---
 deps/Makefile                                    |  1 +
 deps/mariadb-client-library/cmakelists.txt.patch | 13 +++++++++++++
 deps/mariadb-client-library/ma_charset.c.patch   | 12 +++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 deps/mariadb-client-library/cmakelists.txt.patch

diff --git a/deps/Makefile b/deps/Makefile
index c2bdd2e1a6..7fa0cec5b7 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -233,6 +233,7 @@ endif
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../x509cache.patch
 	# patches for replication testing
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_rpl.patch
+	cd mariadb-client-library/mariadb_client && patch -p0 < ../cmakelists.txt.patch
 	cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient
 #	cd mariadb-client-library/mariadb_client/include && make my_config.h
 
diff --git a/deps/mariadb-client-library/cmakelists.txt.patch b/deps/mariadb-client-library/cmakelists.txt.patch
new file mode 100644
index 0000000000..40c0a5d038
--- /dev/null
+++ b/deps/mariadb-client-library/cmakelists.txt.patch
@@ -0,0 +1,13 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index d7150b4d..86c4dc6c 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -286,7 +286,7 @@ ELSEIF()
+ ENDIF()
+ 
+ IF(NOT DEFAULT_CHARSET)
+-  SET(DEFAULT_CHARSET "utf8mb4")
++  SET(DEFAULT_CHARSET "latin1")
+ ENDIF()
+ 
+ 
diff --git a/deps/mariadb-client-library/ma_charset.c.patch b/deps/mariadb-client-library/ma_charset.c.patch
index d3661fa540..9892f4cb5f 100644
--- a/deps/mariadb-client-library/ma_charset.c.patch
+++ b/deps/mariadb-client-library/ma_charset.c.patch
@@ -1,5 +1,5 @@
 diff --git libmariadb/ma_charset.c libmariadb/ma_charset.c
-index f6ed6f80..fbe5ac8d 100644
+index f6ed6f80..4a1207f1 100644
 --- libmariadb/ma_charset.c
 +++ libmariadb/ma_charset.c
 @@ -542,7 +542,7 @@ static unsigned int check_mb_gb18030_valid(const char * start, const char * end)
@@ -20,3 +20,13 @@ index f6ed6f80..fbe5ac8d 100644
    { 193, 1, UTF8_MB3, UTF8_MB3"_icelandic_ci", "", 65001, "UTF-8", 1, 3, mysql_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
    { 194, 1, UTF8_MB3, UTF8_MB3"_latvian_ci", "", 65001, "UTF-8", 1, 3, mysql_mbcharlen_utf8mb3,  check_mb_utf8mb3_valid},
    { 195, 1, UTF8_MB3, UTF8_MB3"_romanian_ci", "", 65001, "UTF-8", 1, 3, mysql_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
+@@ -1083,9 +1083,6 @@ MARIADB_CHARSET_INFO * mysql_find_charset_name(const char *name)
+   else
+     csname= (char *)name;
+ 
+-  if (!strcasecmp("utf8",csname))
+-    csname= "utf8mb3";
+-
+   do {
+     if (!strcasecmp(c->csname, csname)) {
+       return(c);