diff options
| author | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-11-30 23:11:03 +0200 |
| commit | 1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a (patch) | |
| tree | a0c58838a4dd7bdf2ed4d739563da27727ada7b0 /mysys/charset.c | |
| parent | b2e979d868d5d5964d58c97ed9580e07f6123217 (diff) | |
| parent | 6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff) | |
| download | mariadb-git-1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a.tar.gz | |
merge with 5.1
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 153ef8b7e2c..7b72f1f5ae3 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -199,6 +199,7 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs) } +#if defined(HAVE_UCA_COLLATIONS) && (defined(HAVE_CHARSET_ucs2) || defined(HAVE_CHARSET_utf8)) static void copy_uca_collation(struct charset_info_st *to, CHARSET_INFO *from) { @@ -212,6 +213,7 @@ copy_uca_collation(struct charset_info_st *to, CHARSET_INFO *from) to->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_STRNXFRM | MY_CS_UNICODE; } +#endif static int add_collation(struct charset_info_st *cs) |