diff options
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 07b7eb2d165..e403b970fe1 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -512,7 +512,8 @@ public: { String *tmp=args[0]->val_str(a); null_value=args[0]->null_value; - tmp->set_charset(&my_charset_bin); + if (tmp) + tmp->set_charset(&my_charset_bin); return tmp; } void fix_length_and_dec() |