← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset-def.cc

  • Committer: Brian Aker
  • Date: 2009-08-21 18:46:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1123.
  • Revision ID: brian@gaz-20090821184631-e11gja79070fvhk4
Cleanup around page checksum removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset-def.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#include "mysys_priv.h"
 
16
#include "mysys/mysys_priv.h"
17
17
 
18
18
/*
19
19
  Include all compiled character sets into the client
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
 
 
46
 
 
47
 
bool init_compiled_charsets(myf flags __attribute__((unused)))
 
43
 
 
44
 
 
45
bool init_compiled_charsets(myf)
48
46
{
49
47
  CHARSET_INFO *cs;
50
48
 
51
49
  add_compiled_collation(&my_charset_bin);
52
 
  add_compiled_collation(&my_charset_filename);
53
50
 
54
 
#ifdef HAVE_CHARSET_utf8mb4
55
51
  add_compiled_collation(&my_charset_utf8mb4_general_ci);
56
52
  add_compiled_collation(&my_charset_utf8mb4_bin);
57
53
  add_compiled_collation(&my_charset_utf8mb4_unicode_ci);
74
70
  add_compiled_collation(&my_charset_utf8mb4_esperanto_uca_ci);
75
71
  add_compiled_collation(&my_charset_utf8mb4_hungarian_uca_ci);
76
72
  add_compiled_collation(&my_charset_utf8mb4_sinhala_uca_ci);
77
 
#endif /* HAVE_CHARSET_utf8mb4 */
78
73
 
79
74
  /* Copy compiled charsets */
80
75
  for (cs=compiled_charsets; cs->name; cs++)
81
76
    add_compiled_collation(cs);
82
 
  
 
77
 
83
78
  return false;
84
79
}