diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-09-23 15:48:47 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-09-23 15:48:47 +0400 |
| commit | 840f1310cb6ee15cffdac5a4d2a95551575b2c3b (patch) | |
| tree | d9151e92561eb73da935cfd2320e047635b677e2 /sql/sql_error.h | |
| parent | b652430f0094e2baa475b6ea3a3d87da24202f76 (diff) | |
| download | mariadb-git-840f1310cb6ee15cffdac5a4d2a95551575b2c3b.tar.gz | |
Fixing a few -Wconversion warnings
Diffstat (limited to 'sql/sql_error.h')
| -rw-r--r-- | sql/sql_error.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h index f020b9cc789..263c5843a4a 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -837,7 +837,10 @@ public: ErrConvString(const String *s) : ErrConv(), str(s->ptr()), len(s->length()), cs(s->charset()) {} const char *ptr() const - { return err_conv(err_buffer, sizeof(err_buffer), str, len, cs); } + { + DBUG_ASSERT(len < UINT_MAX32); + return err_conv(err_buffer, (uint) sizeof(err_buffer), str, (uint) len, cs); + } }; class ErrConvInteger : public ErrConv |