diff options
| author | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
| commit | 4dc50758603d6ed2891412fdb6d37cd8b5541999 (patch) | |
| tree | c31def9d565271ff6ca10ec9c15433a12e91bba6 /extra | |
| parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
| download | mariadb-git-4dc50758603d6ed2891412fdb6d37cd8b5541999.tar.gz | |
Fixed compiler warnings and test failures found by buildbot
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/comp_err.c | 7 | ||||
| -rw-r--r-- | extra/innochecksum.cc | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index 2bab6b60be7..a5530305317 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -327,7 +327,8 @@ static int create_sys_files(struct languages *lang_head, uint error_count) { FILE *to; - uint csnum= 0, length, i, row_nr; + uint csnum= 0, i, row_nr; + ulong length; uchar head[HEADER_LENGTH]; char outfile[FN_REFLEN], *outfile_end; long start_pos; @@ -397,8 +398,8 @@ static int create_sys_files(struct languages *lang_head, DBUG_ASSERT(error_count == row_nr); /* continue with header of the errmsg.sys file */ - length= (my_ftell(to, MYF(0)) - HEADER_LENGTH - - (error_count + section_count) * 2); + length= (ulong) (my_ftell(to, MYF(0)) - HEADER_LENGTH - + (error_count + section_count) * 2); bzero((uchar*) head, HEADER_LENGTH); bmove((uchar*) head, (uchar*) file_head, 4); head[4]= 1; diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index 1ebcbf198ef..622df93fbd5 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -395,7 +395,7 @@ parse_page( } if (per_page_details) { printf("index %lu page %lu leaf %u n_recs %lu data_bytes %lu" - "\n", id, page_no, is_leaf, n_recs, data_bytes); + "\n", (ulong) id, page_no, is_leaf, n_recs, data_bytes); } /* update per-index statistics */ { |