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/records.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/records.cc')
| -rw-r--r-- | sql/records.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/records.cc b/sql/records.cc index 650a51f7f37..ac84ca84ab6 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -205,14 +205,14 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table, if (addon_field) { info->rec_buf= (uchar*) filesort->addon_buf.str; - info->ref_length= filesort->addon_buf.length; + info->ref_length= (uint)filesort->addon_buf.length; info->unpack= filesort->unpack; } else { empty_record(table); info->record= table->record[0]; - info->ref_length= table->file->ref_length; + info->ref_length= (uint)table->file->ref_length; } info->select=select; info->print_error=print_error; |