diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 12:55:58 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 12:55:58 +0000 |
| commit | 6c279ad6a71c63cb595fde7c951aadb31c3dbebc (patch) | |
| tree | 3603f88e1b3bd1e622edb182cccd882dd31ddc8a /sql/discover.cc | |
| parent | f271100836d8a91a775894ec36b869a66a3145e5 (diff) | |
| download | mariadb-git-6c279ad6a71c63cb595fde7c951aadb31c3dbebc.tar.gz | |
MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from 'size_t' to 'type', possible loss of data)
Handle string length as size_t, consistently (almost always:))
Change function prototypes to accept size_t, where in the past
ulong or uint were used. change local/member variables to size_t
when appropriate.
This fix excludes rocksdb, spider,spider, sphinx and connect for now.
Diffstat (limited to 'sql/discover.cc')
| -rw-r--r-- | sql/discover.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/discover.cc b/sql/discover.cc index a683166fb7f..7184cde5e03 100644 --- a/sql/discover.cc +++ b/sql/discover.cc @@ -136,7 +136,7 @@ int writefrm(const char *path, const char *db, const char *table, } else { - error= mysql_file_write(file, frmdata, len, MYF(MY_WME | MY_NABP)); + error= (int)mysql_file_write(file, frmdata, len, MYF(MY_WME | MY_NABP)); if (!error && !tmp_table && opt_sync_frm) error= mysql_file_sync(file, MYF(MY_WME)) || |