Skip to content

Commit

Permalink
Few fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rahim-kanji committed Dec 28, 2023
1 parent 6b4fd99 commit 465ff35
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
1 change: 1 addition & 0 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 13 additions & 0 deletions deps/mariadb-client-library/cmakelists.txt.patch
Original file line number Diff line number Diff line change
@@ -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()


12 changes: 11 additions & 1 deletion deps/mariadb-client-library/ma_charset.c.patch
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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);

0 comments on commit 465ff35

Please sign in to comment.