Fix a truncation warning introduced in MDEV-12323

MariaDB · Jan 4, 2018 · 4496fd7 · 4496fd7
1 parent 8ac1982
commit 4496fd7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2017, MariaDB Corporation.
+Copyright (c) 2016, 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
 	mutex_enter(&recv_sys->mutex);
 
 	if (recv_sys->report(time)) {
-		ulint n_trx = 0, n_rows = 0;
+		ulint n_trx = 0;
+		ulonglong n_rows = 0;
 		for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
 		     t != NULL;
 		     t = UT_LIST_GET_NEXT(trx_list, t)) {
@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
 		}
 		ib_logf(IB_LOG_LEVEL_INFO,
 			"To roll back: " ULINTPF " transactions, "
-			ULINTPF " rows", n_trx, n_rows);
+			"%llu rows", n_trx, n_rows);
 	}
 
 	mutex_exit(&recv_sys->mutex);

diff --git a/storage/xtradb/trx/trx0roll.cc b/storage/xtradb/trx/trx0roll.cc
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2017, MariaDB Corporation.
+Copyright (c) 2016, 2018, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
 	mutex_enter(&recv_sys->mutex);
 
 	if (recv_sys->report(time)) {
-		ulint n_trx = 0, n_rows = 0;
+		ulint n_trx = 0;
+		ulonglong n_rows = 0;
 		for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
 		     t != NULL;
 		     t = UT_LIST_GET_NEXT(trx_list, t)) {
@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
 		}
 		ib_logf(IB_LOG_LEVEL_INFO,
 			"To roll back: " ULINTPF " transactions, "
-			ULINTPF " rows", n_trx, n_rows);
+			"%llu rows", n_trx, n_rows);
 	}
 
 	mutex_exit(&recv_sys->mutex);