diff options
| author | Anurag Shekhar <anurag.shekhar@sun.com> | 2009-05-13 15:41:24 +0530 |
|---|---|---|
| committer | Anurag Shekhar <anurag.shekhar@sun.com> | 2009-05-13 15:41:24 +0530 |
| commit | 8c73cafc4cd724782787ab03ac6737a0e701314d (patch) | |
| tree | fb8262c6f65d475782cb47eccddf3a4dcdc8a5d0 /storage/federated | |
| parent | 2121599d38442c2a457ceed7549a98a0532006aa (diff) | |
| download | mariadb-git-8c73cafc4cd724782787ab03ac6737a0e701314d.tar.gz | |
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 1f4e1ae48b9..2fdf1bc7900 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2850,10 +2850,10 @@ int ha_federated::info(uint flag) stats.data_file_length= stats.records * stats.mean_rec_length; if (row[12] != NULL) - stats.update_time= (time_t) my_strtoll10(row[12], (char**) 0, + stats.update_time= (ulong) my_strtoll10(row[12], (char**) 0, &error); if (row[13] != NULL) - stats.check_time= (time_t) my_strtoll10(row[13], (char**) 0, + stats.check_time= (ulong) my_strtoll10(row[13], (char**) 0, &error); } /* |