1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-12345 post-merge fix.

Browse Source
This commit is contained in:
Marko Mäkelä 2017-03-30 14:34:45 +03:00
parent 72c6af8d1a
commit d1374c5b77
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
storage/innobase/trx/trx0trx.cc
View File

@ -1457,16 +1457,15 @@ trx_start_low(
if (trx->mysql_thd != NULL) { if (trx->mysql_thd != NULL) {
trx->start_time = thd_start_time_in_secs(trx->mysql_thd); trx->start_time = thd_start_time_in_secs(trx->mysql_thd);
trx->start_time_micro = thd_query_start_micro(trx->mysql_thd);
} else { } else {
trx->start_time = ut_time(); trx->start_time = ut_time();
trx->start_time_micro = 0;
} }
trx->start_time_micro = clock();
ut_a(trx->error_state == DB_SUCCESS); 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); MONITOR_INC(MONITOR_TRX_ACTIVE);
} }