diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2013-12-10 22:11:42 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2013-12-10 22:11:42 -0500 |
| commit | 48e83ba6f79a042022c1949772e999ddb4fd10c4 (patch) | |
| tree | 49300d96fda0237a1d2b37e61286a3fae2df61ff /storage | |
| parent | e1ed3dcebf649a540a8a5fd6293ef1494757fb38 (diff) | |
| download | mariadb-git-48e83ba6f79a042022c1949772e999ddb4fd10c4.tar.gz | |
* Updated auto_increment_xxx_func.result to reflect the changes
made by https://bugs.launchpad.net/codership-mysql/+bug/587170
* Fix for some compiler errors/warnings.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/ut/ut0ut.c | 4 | ||||
| -rw-r--r-- | storage/xtradb/buf/buf0buf.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c index 699af1fcaa1..8b9501ee8bc 100644 --- a/storage/innobase/ut/ut0ut.c +++ b/storage/innobase/ut/ut0ut.c @@ -554,7 +554,7 @@ ut_print_namel( trx ? trx->mysql_thd : NULL, table_id); - fwrite(buf, 1, bufend - buf, f); + (void) fwrite(buf, 1, bufend - buf, f); } /**********************************************************************//** @@ -575,7 +575,7 @@ ut_copy_file( ? (size_t) len : sizeof buf; size_t size = fread(buf, 1, maxs, src); - fwrite(buf, 1, size, dest); + (void) fwrite(buf, 1, size, dest); len -= (long) size; if (size < maxs) { break; diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index f06fd4abfb1..f6d995068c1 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -2537,7 +2537,9 @@ loop: rw_lock_s_unlock(&buf_pool->page_hash_latch); } +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG loop2: +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ if (block && buf_pool_watch_is_sentinel(buf_pool, &block->page)) { mutex_exit(block_mutex); block = NULL; |