From d4b783583d7f6b3aea72153648d7a61a7403b671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 27 Nov 2017 19:58:23 +0100 Subject: [PATCH] Add support for utf8mb4_0900_ai_ci (MySQL 8) #1129 --- deps/Makefile | 1 + deps/mariadb-client-library/my_charset.c.patch | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 deps/mariadb-client-library/my_charset.c.patch diff --git a/deps/Makefile b/deps/Makefile index 5f5878549..c7164556d 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -74,6 +74,7 @@ mariadb-client-library/mariadb_client/include/my_config.h: # cd mariadb-client-library/mariadb_client && patch libmariadb/ma_secure.c < ../ma_secure.c.patch cd mariadb-client-library/mariadb_client && patch include/mysql.h < ../mysql.h.patch cd mariadb-client-library/mariadb_client && patch libmariadb/my_alloc.c < ../my_alloc.c.patch + cd mariadb-client-library/mariadb_client && patch libmariadb/my_charset.c < ../my_charset.c.patch cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} # cd mariadb-client-library/mariadb_client/include && make my_config.h diff --git a/deps/mariadb-client-library/my_charset.c.patch b/deps/mariadb-client-library/my_charset.c.patch new file mode 100644 index 000000000..17ed77ef5 --- /dev/null +++ b/deps/mariadb-client-library/my_charset.c.patch @@ -0,0 +1,8 @@ +@@ -666,6 +666,7 @@ + { 243, 1, UTF8_MB4, UTF8_MB4"_sinhala_ci", "", 65001, "UTF-8", 1, 4, mysql_mbcharlen_utf8, check_mb_utf8_valid}, + + { 254, 1, UTF8_MB3, UTF8_MB3"_general_cs", "", 65001, "UTF-8", 1, 3, mysql_mbcharlen_utf8, check_mb_utf8_valid}, ++ { 255, 1, UTF8_MB4, UTF8_MB4"_0900_ai_ci", "", 65001, "UTF-8", 1, 4, mysql_mbcharlen_utf8, check_mb_utf8_valid}, + { 0, 0, NULL, NULL, NULL, 0, NULL, 0, 0, NULL, NULL} + }; + /* }}} */