Skip to content

Commit d1374c5

Browse files
committed
MDEV-12345 post-merge fix.
1 parent 72c6af8 commit d1374c5

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

storage/innobase/trx/trx0trx.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,16 +1457,15 @@ trx_start_low(
14571457

14581458
if (trx->mysql_thd != NULL) {
14591459
trx->start_time = thd_start_time_in_secs(trx->mysql_thd);
1460+
trx->start_time_micro = thd_query_start_micro(trx->mysql_thd);
1461+
14601462
} else {
14611463
trx->start_time = ut_time();
1464+
trx->start_time_micro = 0;
14621465
}
1463-
trx->start_time_micro = clock();
14641466

14651467
ut_a(trx->error_state == DB_SUCCESS);
14661468

1467-
trx->start_time_micro =
1468-
trx->mysql_thd ? thd_query_start_micro(trx->mysql_thd) : 0;
1469-
14701469
MONITOR_INC(MONITOR_TRX_ACTIVE);
14711470
}
14721471

0 commit comments

Comments
 (0)