diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-16 19:24:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-27 22:51:37 +0100 |
| commit | f97d879bf890fe1d93c459f46410e2be8d26d3b6 (patch) | |
| tree | 948a0951ebc0b32f9ed4b61aebf7143355a7a815 /sql-common/client.c | |
| parent | 1a4746e1285bbe03d616310cd49c3548825d5a1a (diff) | |
| download | mariadb-git-f97d879bf890fe1d93c459f46410e2be8d26d3b6.tar.gz | |
cmake: re-enable -Werror in the maintainer mode
now we can afford it. Fix -Werror errors. Note:
* old gcc is bad at detecting uninit variables, disable it.
* time_t is int or long, cast it for printf's
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 4fa167a21f1..60aa558dfb3 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1354,7 +1354,7 @@ unpack_fields(MYSQL *mysql, MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, { uchar *pos; /* fields count may be wrong */ - if (field - result >= fields) + if (field - result >= (my_ptrdiff_t)fields) goto err; cli_fetch_lengths(&lengths[0], row->data, default_value ? 8 : 7); @@ -1401,7 +1401,7 @@ unpack_fields(MYSQL *mysql, MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, /* old protocol, for backward compatibility */ for (row=data->data; row ; row = row->next,field++) { - if (field - result >= fields) + if (field - result >= (my_ptrdiff_t)fields) goto err; cli_fetch_lengths(&lengths[0], row->data, default_value ? 6 : 5); field->org_table= field->table= strdup_root(alloc,(char*) row->data[0]); @@ -1439,7 +1439,7 @@ unpack_fields(MYSQL *mysql, MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, } } #endif /* DELETE_SUPPORT_OF_4_0_PROTOCOL */ - if (field - result < fields) + if (field - result < (my_ptrdiff_t)fields) goto err; free_rows(data); /* Free old data */ DBUG_RETURN(result); |