diff options
| author | unknown <ram@mysql.r18.ru> | 2003-09-08 17:30:53 +0500 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2003-09-08 17:30:53 +0500 |
| commit | 1d3d64d69b9bf96a18768df031dc2cad29e84b15 (patch) | |
| tree | e95991136dc2d51131e203aa840522f9c944a80a /sql/item_strfunc.cc | |
| parent | ca2ab3537c454bb0f31ef23c0c2d016ce10748cb (diff) | |
| download | mariadb-git-1d3d64d69b9bf96a18768df031dc2cad29e84b15.tar.gz | |
Fix for the bug #1209: SELECT DATABASE().
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index f8cc602129f..c4ad7f1e1e2 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1454,8 +1454,8 @@ String *Item_func_database::val_str(String *str) THD *thd= current_thd; if (!thd->db) { - str->length(0); - str->set_charset(system_charset_info); + null_value= 1; + return 0; } else str->copy((const char*) thd->db,(uint) strlen(thd->db),system_charset_info); |