diff options
| author | Monty <monty@mariadb.org> | 2019-05-29 15:14:09 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-05-29 15:14:09 +0300 |
| commit | 7060b0320d1479bb9476e0cbd4acc584e059e1ff (patch) | |
| tree | fa3cc1eef9270e3ec5ada5da567fa0c930cce9b4 | |
| parent | e99ed820d790617a029b03d9c4ab437c246c956a (diff) | |
| download | mariadb-git-7060b0320d1479bb9476e0cbd4acc584e059e1ff.tar.gz | |
Fixed c++11 narrowing error in table.cc
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index bd651673388..4805017972c 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -8813,7 +8813,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id) store(FLD_BEGIN_TS, thd->transaction_time()); thd->set_time(); - timeval end_time= {thd->query_start(), long(thd->query_start_sec_part())}; + timeval end_time= {thd->query_start(), int(thd->query_start_sec_part())}; store(FLD_TRX_ID, start_id); store(FLD_COMMIT_ID, end_id); store(FLD_COMMIT_TS, end_time); |