summaryrefslogtreecommitdiff
path: root/storage/xtradb/fsp/fsp0fsp.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2015-11-24 20:04:12 +0200
committerMonty <monty@mariadb.org>2015-11-24 20:04:12 +0200
commitf813a0002922949a23c75affbee530076f4aa1bb (patch)
tree9575212477e26c8f1a4c6957ebe9ec6ff515cd79 /storage/xtradb/fsp/fsp0fsp.cc
parentb30a768e7bcaf926cfacc4b617338184e8d72fe3 (diff)
downloadmariadb-git-f813a0002922949a23c75affbee530076f4aa1bb.tar.gz
Fixed failing test cases and compiler warnings found by buildbot
- Added some extra command to rpl_start_stop to ensure that the IO thread has connected to the master before we shut down the server. - if signal returns signalhandler_t, use this with the alarm code - Added missing tests to sys_vars - Fixed some possible overflow bugs in tabxml.cpp
Diffstat (limited to 'storage/xtradb/fsp/fsp0fsp.cc')
-rw-r--r--storage/xtradb/fsp/fsp0fsp.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/fsp/fsp0fsp.cc b/storage/xtradb/fsp/fsp0fsp.cc
index cb51366df16..ef27e688a3f 100644
--- a/storage/xtradb/fsp/fsp0fsp.cc
+++ b/storage/xtradb/fsp/fsp0fsp.cc
@@ -2810,8 +2810,8 @@ try_to_extend:
if (rounds > 50) {
ib_logf(IB_LOG_LEVEL_INFO,
"Space id %lu trying to reserve %lu extents actually reserved %lu "
- " reserve %lu free %lu size %lu rounds %lu total_reserved %lu",
- space, n_ext, n_pages_added, reserve, n_free, size, rounds, total_reserved);
+ " reserve %lu free %lu size %lu rounds %lu total_reserved %llu",
+ space, n_ext, n_pages_added, reserve, n_free, size, rounds, (ullint) total_reserved);
}
goto try_again;