diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-01-09 13:50:18 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-01-09 13:50:18 +0200 |
| commit | ac885d5dfbe4c094f693851433516265a57868d6 (patch) | |
| tree | d2c700b58b3a495ae4d568d4c8e77e8e32bffe14 /sql | |
| parent | 374f49b2629114a9473268da4321af405a9d2394 (diff) | |
| download | mariadb-git-ac885d5dfbe4c094f693851433516265a57868d6.tar.gz | |
Bug #41437: Value stored in 'case' lacks charset, causes segfault
When substituting system constant functions with a constant result
the server was not expecting that the function may return NULL.
Fixed by checking for NULL and returning Item_null (in the relevant
collation) if the result of the system constant function was NULL.
mysql-test/r/mysql.result:
Bug #41437: test case
mysql-test/t/mysql.test:
Bug #41437: test case.
Relies on database() returning NULL if no database is
selected.
sql/item_strfunc.cc:
Bug #41437: Check for NULL result on evaluating the system
constant function and return a constant NULL item.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index d1e3f45bba1..34f974042a5 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1696,6 +1696,12 @@ Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs) Item_string *conv; uint conv_errors; String tmp, cstr, *ostr= val_str(&tmp); + if (null_value) + { + Item *null_item= new Item_null((char *) fully_qualified_func_name()); + null_item->collation.set (tocs); + return null_item; + } cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors); if (conv_errors || !(conv= new Item_static_string_func(fully_qualified_func_name(), |