From 5de9dd7b472ac89f7984aae8135d59b3d717d388 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Fri, 28 Jun 2019 21:12:57 +0400 Subject: A cleanup for MDEV-19897 Rename source code variable names from utf8 to utf8mb3 `cmake . -DWITH_EXTRA_CHARSETS=complex` did not compile. Fixing forgotten "utf8" to "utf8mb3" in definitions of CHARSET and CHARSETS_AVAILABLE in cmake/character_sets.cmake --- cmake/character_sets.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/character_sets.cmake b/cmake/character_sets.cmake index 4d59df825e8..fc6f1d2d343 100644 --- a/cmake/character_sets.cmake +++ b/cmake/character_sets.cmake @@ -22,10 +22,10 @@ IF(NOT DEFAULT_COLLATION) SET(DEFAULT_COLLATION "latin1_swedish_ci") ENDIF() -SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8 utf8mb4) +SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8mb3 utf8mb4) SET(CHARSETS_COMPLEX big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 - sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf16le utf32) + sjis tis620 ucs2 ujis utf8mb3 utf8mb4 utf16 utf16le utf32) SET(CHARSETS_AVAILABLE binary armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257 -- cgit v1.2.1