Skip to content

Commit 85c5e7c

Browse files
author
Tor Didriksen
committed
Bug#22552125 REMOVE THE -DWITH_EXTRA_CHARSETS COMPILE OPTION IN 5.8
Remove all #ifdef HAVE_CHARSET_xxx
1 parent 6efae01 commit 85c5e7c

25 files changed

+36
-535
lines changed

‎client/mysqldump.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -88,11 +88,7 @@
8888
#define IGNORE_NONE 0x00 /* no ignore */
8989
#define IGNORE_DATA 0x01 /* don't dump data for this table */
9090

91-
#ifdef HAVE_CHARSET_utf8
9291
#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"
93-
#else
94-
#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
95-
#endif
9692

9793
/* Maximum number of fields per table */
9894
#define MAX_FIELDS 4000

‎cmake/character_sets.cmake

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -22,61 +22,9 @@ IF(NOT DEFAULT_COLLATION)
2222
SET(DEFAULT_COLLATION "latin1_swedish_ci")
2323
ENDIF()
2424

25-
SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8 utf8mb4)
26-
27-
SET(CHARSETS_AVAILABLE
28-
armscii8
29-
ascii
30-
big5
31-
binary
32-
cp1250
33-
cp1251
34-
cp1256
35-
cp1257
36-
cp850
37-
cp852
38-
cp866
39-
cp932
40-
dec8
41-
eucjpms
42-
euckr
43-
gb18030
44-
gb2312
45-
gbk
46-
geostd8
47-
greek
48-
hebrew
49-
hp8
50-
keybcs2
51-
koi8r
52-
koi8u
53-
latin1
54-
latin2
55-
latin5
56-
latin7
57-
macce
58-
macroman
59-
sjis
60-
swe7
61-
tis620
62-
ucs2
63-
ujis
64-
utf16
65-
utf16le
66-
utf32
67-
utf8
68-
utf8mb4
69-
)
70-
7125
IF(WITH_EXTRA_CHARSETS AND NOT WITH_EXTRA_CHARSETS STREQUAL "all")
7226
MESSAGE(WARNING "Option WITH_EXTRA_CHARSETS is no longer supported")
7327
ENDIF()
7428

75-
SET(CHARSETS ${CHARSETS} ${CHARSETS_AVAILABLE})
76-
7729
SET(MYSQL_DEFAULT_CHARSET_NAME "${DEFAULT_CHARSET}")
7830
SET(MYSQL_DEFAULT_COLLATION_NAME "${DEFAULT_COLLATION}")
79-
80-
FOREACH(cs in ${CHARSETS})
81-
SET(HAVE_CHARSET_${cs} 1)
82-
ENDFOREACH()

‎config.h.cmake

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -288,46 +288,6 @@
288288
*/
289289
#cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@"
290290
#cmakedefine MYSQL_DEFAULT_COLLATION_NAME "@MYSQL_DEFAULT_COLLATION_NAME@"
291-
#cmakedefine HAVE_CHARSET_armscii8 1
292-
#cmakedefine HAVE_CHARSET_ascii 1
293-
#cmakedefine HAVE_CHARSET_big5 1
294-
#cmakedefine HAVE_CHARSET_cp1250 1
295-
#cmakedefine HAVE_CHARSET_cp1251 1
296-
#cmakedefine HAVE_CHARSET_cp1256 1
297-
#cmakedefine HAVE_CHARSET_cp1257 1
298-
#cmakedefine HAVE_CHARSET_cp850 1
299-
#cmakedefine HAVE_CHARSET_cp852 1
300-
#cmakedefine HAVE_CHARSET_cp866 1
301-
#cmakedefine HAVE_CHARSET_cp932 1
302-
#cmakedefine HAVE_CHARSET_dec8 1
303-
#cmakedefine HAVE_CHARSET_eucjpms 1
304-
#cmakedefine HAVE_CHARSET_euckr 1
305-
#cmakedefine HAVE_CHARSET_gb2312 1
306-
#cmakedefine HAVE_CHARSET_gbk 1
307-
#cmakedefine HAVE_CHARSET_gb18030 1
308-
#cmakedefine HAVE_CHARSET_geostd8 1
309-
#cmakedefine HAVE_CHARSET_greek 1
310-
#cmakedefine HAVE_CHARSET_hebrew 1
311-
#cmakedefine HAVE_CHARSET_hp8 1
312-
#cmakedefine HAVE_CHARSET_keybcs2 1
313-
#cmakedefine HAVE_CHARSET_koi8r 1
314-
#cmakedefine HAVE_CHARSET_koi8u 1
315-
#cmakedefine HAVE_CHARSET_latin1 1
316-
#cmakedefine HAVE_CHARSET_latin2 1
317-
#cmakedefine HAVE_CHARSET_latin5 1
318-
#cmakedefine HAVE_CHARSET_latin7 1
319-
#cmakedefine HAVE_CHARSET_macce 1
320-
#cmakedefine HAVE_CHARSET_macroman 1
321-
#cmakedefine HAVE_CHARSET_sjis 1
322-
#cmakedefine HAVE_CHARSET_swe7 1
323-
#cmakedefine HAVE_CHARSET_tis620 1
324-
#cmakedefine HAVE_CHARSET_ucs2 1
325-
#cmakedefine HAVE_CHARSET_ujis 1
326-
#cmakedefine HAVE_CHARSET_utf8mb4 1
327-
#cmakedefine HAVE_CHARSET_utf8mb3 1
328-
#cmakedefine HAVE_CHARSET_utf8 1
329-
#cmakedefine HAVE_CHARSET_utf16 1
330-
#cmakedefine HAVE_CHARSET_utf32 1
331291

332292
/*
333293
* Feature set

‎mysys/charset-def.cc

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
*/
2828

2929

30-
# ifdef HAVE_CHARSET_ucs2
3130
extern CHARSET_INFO my_charset_ucs2_german2_uca_ci;
3231
extern CHARSET_INFO my_charset_ucs2_icelandic_uca_ci;
3332
extern CHARSET_INFO my_charset_ucs2_latvian_uca_ci;
@@ -51,10 +50,8 @@ extern CHARSET_INFO my_charset_ucs2_croatian_uca_ci;
5150
extern CHARSET_INFO my_charset_ucs2_sinhala_uca_ci;
5251
extern CHARSET_INFO my_charset_ucs2_unicode_520_ci;
5352
extern CHARSET_INFO my_charset_ucs2_vietnamese_ci;
54-
# endif /* HAVE_CHARSET_ucs2 */
5553

5654

57-
# ifdef HAVE_CHARSET_utf32
5855
extern CHARSET_INFO my_charset_utf32_german2_uca_ci;
5956
extern CHARSET_INFO my_charset_utf32_icelandic_uca_ci;
6057
extern CHARSET_INFO my_charset_utf32_latvian_uca_ci;
@@ -78,10 +75,8 @@ extern CHARSET_INFO my_charset_utf32_croatian_uca_ci;
7875
extern CHARSET_INFO my_charset_utf32_sinhala_uca_ci;
7976
extern CHARSET_INFO my_charset_utf32_unicode_520_ci;
8077
extern CHARSET_INFO my_charset_utf32_vietnamese_ci;
81-
# endif /* HAVE_CHARSET_utf32 */
8278

8379

84-
# ifdef HAVE_CHARSET_utf16
8580
extern CHARSET_INFO my_charset_utf16_german2_uca_ci;
8681
extern CHARSET_INFO my_charset_utf16_icelandic_uca_ci;
8782
extern CHARSET_INFO my_charset_utf16_latvian_uca_ci;
@@ -105,10 +100,8 @@ extern CHARSET_INFO my_charset_utf16_croatian_uca_ci;
105100
extern CHARSET_INFO my_charset_utf16_sinhala_uca_ci;
106101
extern CHARSET_INFO my_charset_utf16_unicode_520_ci;
107102
extern CHARSET_INFO my_charset_utf16_vietnamese_ci;
108-
# endif /* HAVE_CHARSET_utf16 */
109103

110104

111-
# ifdef HAVE_CHARSET_utf8
112105
extern CHARSET_INFO my_charset_utf8_german2_uca_ci;
113106
extern CHARSET_INFO my_charset_utf8_icelandic_uca_ci;
114107
extern CHARSET_INFO my_charset_utf8_latvian_uca_ci;
@@ -132,9 +125,8 @@ extern CHARSET_INFO my_charset_utf8_croatian_uca_ci;
132125
extern CHARSET_INFO my_charset_utf8_sinhala_uca_ci;
133126
extern CHARSET_INFO my_charset_utf8_unicode_520_ci;
134127
extern CHARSET_INFO my_charset_utf8_vietnamese_ci;
135-
# endif
136128

137-
# ifdef HAVE_CHARSET_utf8mb4
129+
138130
extern CHARSET_INFO my_charset_utf8mb4_german2_uca_ci;
139131
extern CHARSET_INFO my_charset_utf8mb4_icelandic_uca_ci;
140132
extern CHARSET_INFO my_charset_utf8mb4_latvian_uca_ci;
@@ -158,11 +150,9 @@ extern CHARSET_INFO my_charset_utf8mb4_croatian_uca_ci;
158150
extern CHARSET_INFO my_charset_utf8mb4_sinhala_uca_ci;
159151
extern CHARSET_INFO my_charset_utf8mb4_unicode_520_ci;
160152
extern CHARSET_INFO my_charset_utf8mb4_vietnamese_ci;
161-
# endif /* HAVE_CHARSET_utf8mb4 */
162153

163-
# ifdef HAVE_CHARSET_gb18030
154+
164155
extern CHARSET_INFO my_charset_gb18030_unicode_520_ci;
165-
# endif /* HAVE_CHARSET_gb18030 */
166156

167157

168158
my_bool init_compiled_charsets(myf flags __attribute__((unused)))
@@ -175,61 +165,38 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
175165
add_compiled_collation(&my_charset_latin1_bin);
176166
add_compiled_collation(&my_charset_latin1_german2_ci);
177167

178-
#ifdef HAVE_CHARSET_big5
179168
add_compiled_collation(&my_charset_big5_chinese_ci);
180169
add_compiled_collation(&my_charset_big5_bin);
181-
#endif
182170

183-
#ifdef HAVE_CHARSET_cp1250
184171
add_compiled_collation(&my_charset_cp1250_czech_ci);
185-
#endif
186172

187-
#ifdef HAVE_CHARSET_cp932
188173
add_compiled_collation(&my_charset_cp932_japanese_ci);
189174
add_compiled_collation(&my_charset_cp932_bin);
190-
#endif
191175

192-
#ifdef HAVE_CHARSET_latin2
193176
add_compiled_collation(&my_charset_latin2_czech_ci);
194-
#endif
195177

196-
#ifdef HAVE_CHARSET_eucjpms
197178
add_compiled_collation(&my_charset_eucjpms_japanese_ci);
198179
add_compiled_collation(&my_charset_eucjpms_bin);
199-
#endif
200180

201-
#ifdef HAVE_CHARSET_euckr
202181
add_compiled_collation(&my_charset_euckr_korean_ci);
203182
add_compiled_collation(&my_charset_euckr_bin);
204-
#endif
205183

206-
#ifdef HAVE_CHARSET_gb2312
207184
add_compiled_collation(&my_charset_gb2312_chinese_ci);
208185
add_compiled_collation(&my_charset_gb2312_bin);
209-
#endif
210186

211-
#ifdef HAVE_CHARSET_gbk
212187
add_compiled_collation(&my_charset_gbk_chinese_ci);
213188
add_compiled_collation(&my_charset_gbk_bin);
214-
#endif
215189

216-
#ifdef HAVE_CHARSET_gb18030
217190
add_compiled_collation(&my_charset_gb18030_unicode_520_ci);
218191
add_compiled_collation(&my_charset_gb18030_chinese_ci);
219192
add_compiled_collation(&my_charset_gb18030_bin);
220-
#endif /* HAVE_CHARSET_gb18030 */
221193

222-
#ifdef HAVE_CHARSET_sjis
223194
add_compiled_collation(&my_charset_sjis_japanese_ci);
224195
add_compiled_collation(&my_charset_sjis_bin);
225-
#endif
226196

227-
#ifdef HAVE_CHARSET_tis620
228197
add_compiled_collation(&my_charset_tis620_thai_ci);
229198
add_compiled_collation(&my_charset_tis620_bin);
230-
#endif
231199

232-
#ifdef HAVE_CHARSET_ucs2
233200
add_compiled_collation(&my_charset_ucs2_general_ci);
234201
add_compiled_collation(&my_charset_ucs2_bin);
235202
add_compiled_collation(&my_charset_ucs2_general_mysql500_ci);
@@ -257,14 +224,10 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
257224
add_compiled_collation(&my_charset_ucs2_sinhala_uca_ci);
258225
add_compiled_collation(&my_charset_ucs2_unicode_520_ci);
259226
add_compiled_collation(&my_charset_ucs2_vietnamese_ci);
260-
#endif // HAVE_CHARSET_ucs2
261227

262-
#ifdef HAVE_CHARSET_ujis
263228
add_compiled_collation(&my_charset_ujis_japanese_ci);
264229
add_compiled_collation(&my_charset_ujis_bin);
265-
#endif
266230

267-
#ifdef HAVE_CHARSET_utf8
268231
add_compiled_collation(&my_charset_utf8_general_ci);
269232
add_compiled_collation(&my_charset_utf8_tolower_ci);
270233
add_compiled_collation(&my_charset_utf8_bin);
@@ -293,10 +256,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
293256
add_compiled_collation(&my_charset_utf8_sinhala_uca_ci);
294257
add_compiled_collation(&my_charset_utf8_unicode_520_ci);
295258
add_compiled_collation(&my_charset_utf8_vietnamese_ci);
296-
#endif /* HAVE_CHARSET_utf8 */
297259

298260

299-
#ifdef HAVE_CHARSET_utf8mb4
300261
add_compiled_collation(&my_charset_utf8mb4_general_ci);
301262
add_compiled_collation(&my_charset_utf8mb4_bin);
302263
add_compiled_collation(&my_charset_utf8mb4_unicode_ci);
@@ -323,10 +284,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
323284
add_compiled_collation(&my_charset_utf8mb4_sinhala_uca_ci);
324285
add_compiled_collation(&my_charset_utf8mb4_unicode_520_ci);
325286
add_compiled_collation(&my_charset_utf8mb4_vietnamese_ci);
326-
#endif /* HAVE_CHARSET_utf8mb4 */
327287

328288

329-
#ifdef HAVE_CHARSET_utf16
330289
add_compiled_collation(&my_charset_utf16_general_ci);
331290
add_compiled_collation(&my_charset_utf16_bin);
332291
add_compiled_collation(&my_charset_utf16le_general_ci);
@@ -355,10 +314,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
355314
add_compiled_collation(&my_charset_utf16_sinhala_uca_ci);
356315
add_compiled_collation(&my_charset_utf16_unicode_520_ci);
357316
add_compiled_collation(&my_charset_utf16_vietnamese_ci);
358-
#endif /* HAVE_CHARSET_utf16 */
359317

360318

361-
#ifdef HAVE_CHARSET_utf32
362319
add_compiled_collation(&my_charset_utf32_general_ci);
363320
add_compiled_collation(&my_charset_utf32_bin);
364321
add_compiled_collation(&my_charset_utf32_unicode_ci);
@@ -385,7 +342,6 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
385342
add_compiled_collation(&my_charset_utf32_sinhala_uca_ci);
386343
add_compiled_collation(&my_charset_utf32_unicode_520_ci);
387344
add_compiled_collation(&my_charset_utf32_vietnamese_ci);
388-
#endif /* HAVE_CHARSET_utf32 */
389345

390346
/* Copy compiled charsets */
391347
for (cs=compiled_charsets; cs->name; cs++)

‎mysys/charset.cc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,41 +196,31 @@ static int add_collation(CHARSET_INFO *cs)
196196

197197
if (!strcmp(cs->csname,"ucs2") )
198198
{
199-
#if defined(HAVE_CHARSET_ucs2)
200199
copy_uca_collation(newcs, &my_charset_ucs2_unicode_ci);
201200
newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_NONASCII;
202-
#endif
203201
}
204202
else if (!strcmp(cs->csname, "utf8") || !strcmp(cs->csname, "utf8mb3"))
205203
{
206-
#if defined (HAVE_CHARSET_utf8)
207204
copy_uca_collation(newcs, &my_charset_utf8_unicode_ci);
208205
newcs->ctype= my_charset_utf8_unicode_ci.ctype;
209206
if (init_state_maps(newcs))
210207
return MY_XML_ERROR;
211-
#endif
212208
}
213209
else if (!strcmp(cs->csname, "utf8mb4"))
214210
{
215-
#if defined (HAVE_CHARSET_utf8mb4)
216211
copy_uca_collation(newcs, &my_charset_utf8mb4_unicode_ci);
217212
newcs->ctype= my_charset_utf8mb4_unicode_ci.ctype;
218213
newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED;
219-
#endif
220214
}
221215
else if (!strcmp(cs->csname, "utf16"))
222216
{
223-
#if defined (HAVE_CHARSET_utf16)
224217
copy_uca_collation(newcs, &my_charset_utf16_unicode_ci);
225218
newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_NONASCII;
226-
#endif
227219
}
228220
else if (!strcmp(cs->csname, "utf32"))
229221
{
230-
#if defined (HAVE_CHARSET_utf32)
231222
copy_uca_collation(newcs, &my_charset_utf32_unicode_ci);
232223
newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_NONASCII;
233-
#endif
234224
}
235225
else
236226
{
@@ -890,9 +880,7 @@ CHARSET_INFO *fs_character_set()
890880
let's just detect it using strcmp().
891881
*/
892882
fs_cset_cache=
893-
#ifdef HAVE_CHARSET_cp932
894883
!strcmp(buf, "cp932") ? &my_charset_cp932_japanese_ci :
895-
#endif
896884
&my_charset_bin;
897885
}
898886
return fs_cset_cache;

‎strings/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SET(STRINGS_SOURCES
5757
ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H)
5858
ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})
5959

60-
ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.cc)
60+
ADD_EXECUTABLE(conf_to_src conf_to_src.cc)
6161
TARGET_LINK_LIBRARIES(conf_to_src strings)
6262

6363
IF(MSVC)

0 commit comments

Comments
 (0)