From d1374c5b775a9246dd3895198f56b69e33cd8de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 30 Mar 2017 14:34:45 +0300 Subject: [PATCH] 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); }