From d54f869f8c34e5bb93ab187cfc6495f9e192c259 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@mysql.com>
Date: Tue, 30 Nov 2010 01:14:34 +0200
Subject: [PATCH] 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
---
 configure.in                                          | 1 +
 mysql-test/suite/innodb_plugin/t/innodb_bug56680.test | 1 +
 mysys/charset.c                                       | 2 ++
 storage/xtradb/srv/srv0srv.c                          | 6 +++---
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 67b6b94340b..ebb705fc48e 100644
--- a/configure.in
+++ b/configure.in
@@ -123,6 +123,7 @@ then
 fi
 
 # Whether the maintainer mode should be enabled.
+# Note that this uses $with_debug and $with_valgrind
 MY_MAINTAINER_MODE
 
 # Canonicalize the configuration name.
diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test b/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
index 8d0f685c723..e30e2b8fd96 100644
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
@@ -2,6 +2,7 @@
 # Bug #56680 InnoDB may return wrong results from a case-insensitive index
 #
 -- source include/have_innodb_plugin.inc
+-- source include/not_valgrind.inc
 
 -- disable_query_log
 SET @tx_isolation_orig = @@tx_isolation;
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)
diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c
index 391fb4c11ae..637b9e2df28 100644
--- a/storage/xtradb/srv/srv0srv.c
+++ b/storage/xtradb/srv/srv0srv.c
@@ -1125,7 +1125,7 @@ retry:
 			enter_innodb_with_tickets(trx);
 			return;
 		}
-		os_atomic_increment_lint(&srv_conc_n_threads, -1);
+		(void) os_atomic_increment_lint(&srv_conc_n_threads, -1);
 	}
 	if (!has_yielded)
 	{
@@ -1155,7 +1155,7 @@ retry:
 static void
 srv_conc_exit_innodb_timer_based(trx_t* trx)
 {
-	os_atomic_increment_lint(&srv_conc_n_threads, -1);
+        (void) os_atomic_increment_lint(&srv_conc_n_threads, -1);
 	trx->declared_to_be_inside_innodb = FALSE;
 	trx->n_tickets_to_enter_innodb = 0;
 	return;
@@ -1362,7 +1362,7 @@ srv_conc_force_enter_innodb(
 	ut_ad(srv_conc_n_threads >= 0);
 #ifdef HAVE_ATOMIC_BUILTINS
 	if (srv_thread_concurrency_timer_based) {
-		os_atomic_increment_lint(&srv_conc_n_threads, 1);
+                (void) os_atomic_increment_lint(&srv_conc_n_threads, 1);
 		trx->declared_to_be_inside_innodb = TRUE;
 		trx->n_tickets_to_enter_innodb = 1;
 		return;