From 34fa79e9b11873d97f6e0088989cc8408c6578c5 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Wed, 1 Dec 2010 22:18:03 +0200
Subject: [PATCH] Fixed failures in buildbot

mysql-test/suite/innodb_plugin/t/innodb_bug38231.test:
  Sometimes you get a timeout here; Disable the not fatal error message.
storage/xtradb/sync/sync0rw.c:
  Disable compiler warning
---
 mysql-test/suite/innodb_plugin/t/innodb_bug38231.test | 1 +
 storage/xtradb/sync/sync0rw.c                         | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test b/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test
index be588474bc1..05e39cc16ea 100644
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test
@@ -73,6 +73,7 @@ UNLOCK TABLES;
 
 -- connection con2
 -- reap
+-- error 0, 1205
 UNLOCK TABLES;
 
 -- connection con3
diff --git a/storage/xtradb/sync/sync0rw.c b/storage/xtradb/sync/sync0rw.c
index 5dc6b28d4bf..f1018522fdf 100644
--- a/storage/xtradb/sync/sync0rw.c
+++ b/storage/xtradb/sync/sync0rw.c
@@ -247,10 +247,11 @@ rw_lock_create_func(
 
 	lock->mutex.cmutex_name = cmutex_name;
 	ut_d(lock->mutex.mutex_type = 1);
-#else /* INNODB_RW_LOCKS_USE_ATOMICS */
+#endif /* INNODB_RW_LOCKS_USE_ATOMICS */
+#if defined(INNODB_RW_LOCKS_USE_ATOMICS) || !defined(UNIV_DEBUG)
 	(void) cfile_name;
 	(void) cline;
-#endif /* INNODB_RW_LOCKS_USE_ATOMICS */
+#endif
 
 	lock->lock_word = X_LOCK_DECR;
 	lock->waiters = 0;
-- 
2.30.9