summaryrefslogtreecommitdiff
path: root/storage/perfschema/pfs_host.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-10-04 08:24:06 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-10-04 08:24:06 +0300
commit2c1067166d7e8a9541578220b408f1e553e23916 (patch)
tree2ba0932f92d88e01d51393de63dda842f6daf320 /storage/perfschema/pfs_host.cc
parent2cf3e2ea2fca3d3613309de94d55c88dedb3831a (diff)
parent61b2618d3aae78950f1b8dbe8d4482573c77875d (diff)
downloadmariadb-git-2c1067166d7e8a9541578220b408f1e553e23916.tar.gz
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/perfschema/pfs_host.cc')
-rw-r--r--storage/perfschema/pfs_host.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/perfschema/pfs_host.cc b/storage/perfschema/pfs_host.cc
index 7da34a6d5f6..15db3e80a94 100644
--- a/storage/perfschema/pfs_host.cc
+++ b/storage/perfschema/pfs_host.cc
@@ -190,7 +190,7 @@ static void set_host_key(PFS_host_key *key,
}
ptr[0]= 0;
ptr++;
- key->m_key_length= ptr - &key->m_hash_key[0];
+ key->m_key_length= (uint)(ptr - &key->m_hash_key[0]);
}
PFS_host *find_or_create_host(PFS_thread *thread,