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/item_strfunc.h | |
| parent | b652430f0094e2baa475b6ea3a3d87da24202f76 (diff) | |
| download | mariadb-git-840f1310cb6ee15cffdac5a4d2a95551575b2c3b.tar.gz | |
Fixing a few -Wconversion warnings
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 685a64816be..a7cad234893 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -825,7 +825,7 @@ public: bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec() { - max_length= (username_char_length + + max_length= (uint32) (username_char_length + HOSTNAME_LENGTH + 1) * SYSTEM_CHARSET_MBMAXLEN; } const char *func_name() const { return "user"; } @@ -867,7 +867,7 @@ public: Item_func_sysconst(thd), context(context_arg) {} bool fix_fields(THD *thd, Item **ref); void fix_length_and_dec() - { max_length= username_char_length * SYSTEM_CHARSET_MBMAXLEN; } + { max_length= (uint32) username_char_length * SYSTEM_CHARSET_MBMAXLEN; } int save_in_field(Field *field, bool no_conversions) { return save_str_value_in_field(field, &str_value); } const char *func_name() const { return "current_role"; } |