diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-22 13:59:30 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-22 13:59:30 +0400 |
| commit | 9adb6e991ec87b65d04929f115d9d0c899e4ab19 (patch) | |
| tree | 92784a64dcfdf27f03ea828e5a210b8fa663869c /sql/item_strfunc.cc | |
| parent | 879629e6b2b9cd078f4f6b57aeee6f3c70e188cd (diff) | |
| download | mariadb-git-9adb6e991ec87b65d04929f115d9d0c899e4ab19.tar.gz | |
MDEV-4841 Wrong character set of ADDTIME() and DATE_ADD()
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 039c4417f7b..cf8ce614b6d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -78,7 +78,7 @@ String my_empty_string("",default_charset_info); Normally conversion does not happen, and val_str_ascii() is immediately returned instead. */ -String *Item_str_func::val_str_from_val_str_ascii(String *str, String *str2) +String *Item_func::val_str_from_val_str_ascii(String *str, String *str2) { DBUG_ASSERT(fixed == 1); |