diff options
| author | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
| commit | a0d9f20c0c77702d7a8a3dbc5c295e9b1eefcafa (patch) | |
| tree | 15fd0e625c4d4630e974f0bdc367db5bb6bc740a /extra/comp_err.c | |
| parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
| download | mariadb-git-bb-10.2-decimal.tar.gz | |
Fixed compiler warnings and test failures found by buildbotbb-10.2-decimal
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'extra/comp_err.c')
| -rw-r--r-- | extra/comp_err.c | 7 |
1 files changed, 4 insertions, 3 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; |