MDEV-12345 post-merge fix.

9 years ago · d1374c5b77
1 changed files with 3 additions and 4 deletions
--- 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);
 }