Fix warning C4838 : conversion from 'type_1' to 'type_2' requires a narrowing conversion.

7 years ago · 73a5dd8c54
2 changed files with 7 additions and 2 deletions
--- a/sql/field.cc
+++ b/sql/field.cc
@ -5059,7 +5059,10 @@ int Field_timestamp::store_TIME_with_warning(THD *thd, const Datetime *dt,
  }

  // Adjust and store the value
-  timeval tv= {timestamp, (uint) l_time->second_part};
+  timeval tv;
+  tv.tv_sec= timestamp;
+  tv.tv_usec= l_time->second_part;
+
  my_timeval_trunc(&tv, decimals());
  store_TIMEVAL(tv);

--- a/sql/field.h
+++ b/sql/field.h
@ -2756,7 +2756,9 @@ public:
  }
  void store_TIME(my_time_t timestamp, ulong sec_part)
  {
-    timeval tv= {timestamp, (uint) sec_part};
+    timeval tv;
+    tv.tv_sec= timestamp;
+    tv.tv_usec= sec_part;
    my_timeval_trunc(&tv, decimals());
    store_TIMEVAL(tv);
  }