Merge fixes for #8248, #5569.

mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Merge test
sql/item_strfunc.cc:
  Set charset on output string
sql/item_strfunc.h:
  Merge
sql/sql_parse.cc:
  Merge
vio/viosocket.c:
  Merge
This commit is contained in:
unknown 2005-02-02 08:21:11 -08:00
commit 33e74b1427
7 changed files with 29 additions and 14 deletions

View file

@ -588,6 +588,7 @@ public:
class Item_func_quote :public Item_str_func
{
String tmp_value;
public:
Item_func_quote(Item *a) :Item_str_func(a) {}
const char *func_name() const { return "quote"; }