diff options
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 3aef5d38368..0a1e7d38e01 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -571,7 +571,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 |