diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-11 11:39:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-11 11:39:09 +0200 |
| commit | 34eba1fa24174292bc22b37ffb9b05ae8b240e31 (patch) | |
| tree | cf2e9a40d0905ed185a712de02da03e40932a1a2 /storage | |
| parent | 8b7eaab37d7513e2927b662b43edb0104d8daa5f (diff) | |
| download | mariadb-git-34eba1fa24174292bc22b37ffb9b05ae8b240e31.tar.gz | |
Declarations and code do not mix in C90, not even within UNIV_DEBUG.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/buf/buf0flu.c | 4 | ||||
| -rw-r--r-- | storage/innodb_plugin/sync/sync0rw.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/storage/innodb_plugin/buf/buf0flu.c b/storage/innodb_plugin/buf/buf0flu.c index 2123f8a060d..3a9975ce4b7 100644 --- a/storage/innodb_plugin/buf/buf0flu.c +++ b/storage/innodb_plugin/buf/buf0flu.c @@ -1710,9 +1710,9 @@ buf_flush_validate_low(void) ut_a(om > 0); if (UNIV_LIKELY_NULL(buf_pool->flush_rbt)) { + buf_page_t* rpage; ut_a(rnode); - buf_page_t* rpage = *rbt_value(buf_page_t*, - rnode); + rpage = *rbt_value(buf_page_t*, rnode); ut_a(rpage); ut_a(rpage == bpage); rnode = rbt_next(buf_pool->flush_rbt, rnode); diff --git a/storage/innodb_plugin/sync/sync0rw.c b/storage/innodb_plugin/sync/sync0rw.c index 365a53dcac1..572c3690a7f 100644 --- a/storage/innodb_plugin/sync/sync0rw.c +++ b/storage/innodb_plugin/sync/sync0rw.c @@ -335,10 +335,13 @@ rw_lock_validate( /*=============*/ rw_lock_t* lock) /*!< in: rw-lock */ { + ulint waiters; + lint lock_word; + ut_a(lock); - ulint waiters = rw_lock_get_waiters(lock); - lint lock_word = lock->lock_word; + waiters = rw_lock_get_waiters(lock); + lock_word = lock->lock_word; ut_ad(lock->magic_n == RW_LOCK_MAGIC_N); ut_a(waiters == 0 || waiters == 1); |