diff options
| author | holyfoot/hf@hfmain.(none) <> | 2007-03-08 19:08:28 +0400 |
|---|---|---|
| committer | holyfoot/hf@hfmain.(none) <> | 2007-03-08 19:08:28 +0400 |
| commit | 75be7cd1aebb833309d0224761558eb1e32b6925 (patch) | |
| tree | 159b4f318828e8537baa6d0b846728e8f2a0e84b /sql/item_strfunc.h | |
| parent | 2baf35b4fab1cd1c185b7b98645eb76ed88d9f73 (diff) | |
| parent | 999c1cdcc1a6c82b69ea75d6661f75ed55f405f1 (diff) | |
| download | mariadb-git-75be7cd1aebb833309d0224761558eb1e32b6925.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index ae11e001551..628b51a70d7 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -601,7 +601,11 @@ class Item_func_unhex :public Item_str_func { String tmp_value; public: - Item_func_unhex(Item *a) :Item_str_func(a) {} + Item_func_unhex(Item *a) :Item_str_func(a) + { + /* there can be bad hex strings */ + maybe_null= 1; + } const char *func_name() const { return "unhex"; } String *val_str(String *); void fix_length_and_dec() |