[Commits] d1374c5b775: MDEV-12345 post-merge fix.

marko.makela at mariadb.com marko.makela at mariadb.com
Thu Mar 30 14:35:00 EEST 2017


revision-id: d1374c5b775a9246dd3895198f56b69e33cd8de7 (mariadb-10.2.4-107-gd1374c5b775)
parent(s): 72c6af8d1a9affe132d9343ebdefc4c6bd8bd74f
author: Marko Mäkelä
committer: Marko Mäkelä
timestamp: 2017-03-30 14:34:45 +0300
message:

MDEV-12345 post-merge fix.

---
 storage/innobase/trx/trx0trx.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index 4374041982c..418721bba76 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -1457,16 +1457,15 @@ trx_start_low(
 
 	if (trx->mysql_thd != NULL) {
 		trx->start_time = thd_start_time_in_secs(trx->mysql_thd);
+		trx->start_time_micro = thd_query_start_micro(trx->mysql_thd);
+
 	} else {
 		trx->start_time = ut_time();
+		trx->start_time_micro = 0;
 	}
-	trx->start_time_micro = clock();
 
 	ut_a(trx->error_state == DB_SUCCESS);
 
-	trx->start_time_micro =
-		trx->mysql_thd ? thd_query_start_micro(trx->mysql_thd) : 0;
-
 	MONITOR_INC(MONITOR_TRX_ACTIVE);
 }
 


More information about the commits mailing list