← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset-def.cc

  • Committer: Monty Taylor
  • Date: 2009-07-09 00:04:44 UTC
  • mto: (1093.1.9 captain)
  • mto: This revision was merged to the branch mainline in revision 1097.
  • Revision ID: mordred@inaugust.com-20090709000444-1jf6qw4gvyhdab1a
Got rid of #ifdef have utf8 stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset-def.cc
21
21
  init_compiled_charsets() that only adds those that he wants
22
22
*/
23
23
 
24
 
#ifdef HAVE_CHARSET_utf8mb4
25
24
extern CHARSET_INFO my_charset_utf8mb4_icelandic_uca_ci;
26
25
extern CHARSET_INFO my_charset_utf8mb4_latvian_uca_ci;
27
26
extern CHARSET_INFO my_charset_utf8mb4_romanian_uca_ci;
41
40
extern CHARSET_INFO my_charset_utf8mb4_esperanto_uca_ci;
42
41
extern CHARSET_INFO my_charset_utf8mb4_hungarian_uca_ci;
43
42
extern CHARSET_INFO my_charset_utf8mb4_sinhala_uca_ci;
44
 
#endif /* HAVE_CHARSET_utf8mb4 */
45
43
 
46
44
 
47
45
bool init_compiled_charsets(myf)
50
48
 
51
49
  add_compiled_collation(&my_charset_bin);
52
50
 
53
 
#ifdef HAVE_CHARSET_utf8mb4
54
51
  add_compiled_collation(&my_charset_utf8mb4_general_ci);
55
52
  add_compiled_collation(&my_charset_utf8mb4_bin);
56
53
  add_compiled_collation(&my_charset_utf8mb4_unicode_ci);
73
70
  add_compiled_collation(&my_charset_utf8mb4_esperanto_uca_ci);
74
71
  add_compiled_collation(&my_charset_utf8mb4_hungarian_uca_ci);
75
72
  add_compiled_collation(&my_charset_utf8mb4_sinhala_uca_ci);
76
 
#endif /* HAVE_CHARSET_utf8mb4 */
77
73
 
78
74
  /* Copy compiled charsets */
79
75
  for (cs=compiled_charsets; cs->name; cs++)