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/opt_split.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/opt_split.cc')
| -rw-r--r-- | sql/opt_split.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_split.cc b/sql/opt_split.cc index 8fb8b787299..0cb76f03917 100644 --- a/sql/opt_split.cc +++ b/sql/opt_split.cc @@ -427,7 +427,7 @@ bool JOIN::check_for_splittable_materialized() } /* Count the candidate fields that can be accessed by ref */ - uint spl_field_cnt= candidates.elements(); + uint spl_field_cnt= (uint)candidates.elements(); for (cand= cand_start; cand < cand_end; cand++) { if (!cand->is_usable_for_ref_access) @@ -694,7 +694,7 @@ void JOIN::add_keyuses_for_splitting() (void) add_ext_keyuses_for_splitting_field(ext_keyuses_for_splitting, added_key_field); } - added_keyuse_count= ext_keyuses_for_splitting->elements(); + added_keyuse_count= (uint)ext_keyuses_for_splitting->elements(); if (!added_keyuse_count) goto err; sort_ext_keyuses(ext_keyuses_for_splitting); |