diff options
| author | unknown <sanja@askmonty.org> | 2013-03-14 19:07:20 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-03-14 19:07:20 +0200 |
| commit | ecd4bf62d439b300facb4d5758c4670e6c96b7c5 (patch) | |
| tree | 38a90b75bb728965cc7a60a0f631a7fd7449ef53 /sql/item_strfunc.cc | |
| parent | de5d2550af51593513e3770f109380dcf85979ef (diff) | |
| download | mariadb-git-ecd4bf62d439b300facb4d5758c4670e6c96b7c5.tar.gz | |
MDEV-4272 fix.
Incorrect NULL value handling in Item_func_conv_charset fixed.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index c0a6120b361..e71663a2559 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2987,7 +2987,7 @@ String *Item_func_conv_charset::val_str(String *str) return null_value ? 0 : &str_value; String *arg= args[0]->val_str(str); uint dummy_errors; - if (!arg) + if (args[0]->null_value) { null_value=1; return 0; |