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/semisync_master.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/semisync_master.cc')
| -rw-r--r-- | sql/semisync_master.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc index 5e83847edf9..3c88bdddad4 100644 --- a/sql/semisync_master.cc +++ b/sql/semisync_master.cc @@ -99,8 +99,7 @@ Active_tranx::~Active_tranx() m_num_entries = 0; } -unsigned int Active_tranx::calc_hash(const unsigned char *key, - unsigned int length) +unsigned int Active_tranx::calc_hash(const unsigned char *key, size_t length) { unsigned int nr = 1, nr2 = 4; |