Commit a0dfefb0 authored by Sergey Vojtovich's avatar Sergey Vojtovich

Fixed c++11 narrowing error

sql/table.cc:8561:42: error: non-constant-expression cannot be narrowed
                             from type 'uint' (aka 'unsigned int') to
                             '__darwin_suseconds_t' (aka 'int') in
                             initializer list [-Wc++11-narrowing]
  timeval end_time= {thd->query_start(), uint(thd->query_start_sec_part())};
                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sql/table.cc:8561:42: note: insert an explicit cast to silence this issue
  timeval end_time= {thd->query_start(), uint(thd->query_start_sec_part())};
                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                         static_cast<__darwin_suseconds_t>( )
parent d9613b75
...@@ -8558,7 +8558,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id) ...@@ -8558,7 +8558,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id)
return true; return true;
store(FLD_BEGIN_TS, thd->transaction_time()); store(FLD_BEGIN_TS, thd->transaction_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_TRX_ID, start_id);
store(FLD_COMMIT_ID, end_id); store(FLD_COMMIT_ID, end_id);
store(FLD_COMMIT_TS, end_time); store(FLD_COMMIT_TS, end_time);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment