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

IB: correct way of using start_time_micro [fixes #189]

Browse Source
This commit is contained in:
Aleksey Midenkov 2017-05-11 12:29:14 +03:00
parent f751b30884
commit 7445be89af
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/row/row0ins.cc
View File

@ -3985,7 +3985,7 @@ void vers_notify_vtq(trx_t* trx)
timeval begin_ts, commit_ts; timeval begin_ts, commit_ts;
begin_ts.tv_sec = trx->start_time; begin_ts.tv_sec = trx->start_time;
begin_ts.tv_usec = trx->start_time_micro; begin_ts.tv_usec = trx->start_time_micro % 1000000;
mutex_enter(&trx_sys->mutex); mutex_enter(&trx_sys->mutex);
trx_id_t commit_id = trx_sys_get_new_trx_id(); trx_id_t commit_id = trx_sys_get_new_trx_id();

1
storage/innobase/trx/trx0purge.cc
View File

@ -185,6 +185,7 @@ trx_purge_graph_build(sess_t* sess)
trx->id = 0; trx->id = 0;
ut_usectime((ulong *)&trx->start_time, ut_usectime((ulong *)&trx->start_time,
(ulong *)&trx->start_time_micro); (ulong *)&trx->start_time_micro);
trx->start_time_micro += trx->start_time * 1000000;
trx->state = TRX_STATE_ACTIVE; trx->state = TRX_STATE_ACTIVE;
trx->op_info = "purge trx"; trx->op_info = "purge trx";

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

@ -882,6 +882,7 @@ trx_resurrect_insert(
ut_usectime((ulong *)&trx->start_time, ut_usectime((ulong *)&trx->start_time,
(ulong *)&trx->start_time_micro); (ulong *)&trx->start_time_micro);
trx->start_time_micro += trx->start_time * 1000000;
} }
if (undo->dict_operation) { if (undo->dict_operation) {
@ -983,6 +984,7 @@ trx_resurrect_update(
|| trx->state == TRX_STATE_PREPARED) { || trx->state == TRX_STATE_PREPARED) {
ut_usectime((ulong *)&trx->start_time, ut_usectime((ulong *)&trx->start_time,
(ulong *)&trx->start_time_micro); (ulong *)&trx->start_time_micro);
trx->start_time_micro += trx->start_time * 1000000;
} }
if (undo->dict_operation) { if (undo->dict_operation) {
@ -1351,18 +1353,14 @@ trx_start_low(
} }
} }
ut_usectime((ulong *)&trx->start_time, if (trx->mysql_thd != NULL &&
(ulong *)&trx->start_time_micro); (trx->start_time_micro = thd_query_start_micro(trx->mysql_thd))) {
trx->start_time = trx->start_time_micro / 1000000;
if (trx->mysql_thd != NULL) { } else {
time_t start_time = thd_start_time_in_secs(trx->mysql_thd); ut_usectime((ulong *)&trx->start_time,
ib_uint64_t start_utime = thd_query_start_micro(trx->mysql_thd); (ulong *)&trx->start_time_micro);
if (start_time < trx->start_time || trx->start_time_micro += trx->start_time * 1000000;
(start_time == trx->start_time && start_utime < trx->start_time_micro))
{
trx->start_time = start_time;
trx->start_time_micro = start_utime;
}
} }
trx->vtq_notify_on_commit = false; trx->vtq_notify_on_commit = false;