diff --git a/deps/Makefile b/deps/Makefile index 165fe6b99..2bcde46ee 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -248,8 +248,8 @@ endif cd mariadb-client-library/mariadb_client && patch -p0 < ../mysql.h.patch cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_priv.h.patch cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_alloc.c.patch + cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_charset.c.patch cd mariadb-client-library/mariadb_client && patch include/mariadb_com.h < ../mariadb_com.h.patch - cd mariadb-client-library/mariadb_client && patch libmariadb/ma_charset.c < ../ma_charset.c.patch # cd mariadb-client-library/mariadb_client && patch libmariadb/ma_pvio.c < ../ma_pvio.c.patch cd mariadb-client-library/mariadb_client && patch unittest/libmariadb/basic-t.c < ../unittest_basic-t.c.patch cd mariadb-client-library/mariadb_client && patch unittest/libmariadb/charset.c < ../unittest_charset.c.patch diff --git a/deps/mariadb-client-library/ma_charset.c.patch b/deps/mariadb-client-library/ma_charset.c.patch index 765d47da6..5d74545f4 100644 --- a/deps/mariadb-client-library/ma_charset.c.patch +++ b/deps/mariadb-client-library/ma_charset.c.patch @@ -1,4 +1,8 @@ -@@ -720,7 +720,7 @@ +diff --git libmariadb/ma_charset.c libmariadb/ma_charset.c +index f6ed6f80..aeff8a28 100644 +--- libmariadb/ma_charset.c ++++ libmariadb/ma_charset.c +@@ -722,7 +722,7 @@ const MARIADB_CHARSET_INFO mariadb_compiled_charsets[] = { 182, 1, "utf32", "utf32_unicode_520_ci", "", 0, "UTF32", 4, 4, mysql_mbcharlen_utf32, check_mb_utf32}, { 183, 1, "utf32", "utf32_vietnamese_ci", "", 0, "UTF32", 4, 4, mysql_mbcharlen_utf32, check_mb_utf32},