diff options
| author | Daniel Black <danielgb@au.ibm.com> | 2018-02-25 15:25:54 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 15:25:54 +1100 |
| commit | 0805a9565f09a36104a420d9e229e44b1eea8879 (patch) | |
| tree | 5c5dbf942479c2b7349f1b4505768ddf5a2f8b8d /sql/gcalc_slicescan.cc | |
| parent | 3188131b15c26509e4df3c4b15972d07a20be8bd (diff) | |
| parent | 8936b175106a3fdfc560e9d33aa58a6372084c5f (diff) | |
| download | mariadb-git-0805a9565f09a36104a420d9e229e44b1eea8879.tar.gz | |
Merge branch '10.3' into 10.2-MDEV-10814-dont-dump-query-cache
Diffstat (limited to 'sql/gcalc_slicescan.cc')
| -rw-r--r-- | sql/gcalc_slicescan.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc index da70daea4a8..ce1f4394ebd 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -137,13 +137,13 @@ static void GCALC_DBUG_PRINT_PI(const Gcalc_heap::Info *pi) static void GCALC_DBUG_PRINT_SLICE(const char *header, const Gcalc_scan_iterator::point *slice) { - int nbuf; + size_t nbuf; char buf[1024]; nbuf= strlen(header); strcpy(buf, header); for (; slice; slice= slice->get_next()) { - int lnbuf= nbuf; + size_t lnbuf= nbuf; lnbuf+= sprintf(buf + lnbuf, "%d\t", slice->thread); lnbuf+= sprintf(buf + lnbuf, "%s\t", gcalc_ev_name(slice->event)); @@ -170,7 +170,7 @@ static void GCALC_DBUG_PRINT_SLICE(const char *header, Gcalc_dyn_list::Gcalc_dyn_list(size_t blk_size, size_t sizeof_item): m_blk_size(blk_size - ALLOC_ROOT_MIN_BLOCK_SIZE), m_sizeof_item(ALIGN_SIZE(sizeof_item)), - m_points_per_blk((m_blk_size - PH_DATA_OFFSET) / m_sizeof_item), + m_points_per_blk((uint)((m_blk_size - PH_DATA_OFFSET) / m_sizeof_item)), m_blk_hook(&m_first_blk), m_free(NULL), m_keep(NULL) |