diff options
| author | Michael Widenius <monty@mysql.com> | 2010-11-30 01:14:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-11-30 01:14:34 +0200 |
| commit | d54f869f8c34e5bb93ab187cfc6495f9e192c259 (patch) | |
| tree | e6eb058c64d1a0f5d2feda9d8053ebad1c450f33 /mysys/charset.c | |
| parent | e68ff466534c370b96e96ee3c0b04996ae67ecfd (diff) | |
| download | mariadb-git-d54f869f8c34e5bb93ab187cfc6495f9e192c259.tar.gz | |
Fixed some compiler warnings
configure.in:
Added comment
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test:
Disable test when run with valgrind as we get errors from buf_buddy_relocate() on work for this test.
(Should probably be investigated as this may be an issue in xtradb, but probably harmless)
Work is an amd-64 running openSUSE 1.11 and valgrind 3.4.1
mysys/charset.c:
Remove static function if not used (to remove compiler warning)
storage/xtradb/srv/srv0srv.c:
Added casts to get rid of compiler warnings
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 8d2f68b7bbf..f751e59de82 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -202,6 +202,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(CHARSET_INFO *to, CHARSET_INFO *from) { @@ -215,6 +216,7 @@ copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from) to->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_STRNXFRM | MY_CS_UNICODE; } +#endif static int add_collation(CHARSET_INFO *cs) |