diff options
| author | unknown <jimw@mysql.com> | 2005-02-02 08:21:11 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-02 08:21:11 -0800 |
| commit | 33e74b1427c1e211acc1f06e0384e44bd1edac24 (patch) | |
| tree | f7feeb6b7dbdf2dd8b64422121decec13f0ae311 /sql/item_strfunc.h | |
| parent | 6b6e5d4a1612b2c80d5c5f71c3b0ba0ce19d3cc0 (diff) | |
| parent | 22f839cdd23475075e0f1e9eeeb3c7201f9a4262 (diff) | |
| download | mariadb-git-33e74b1427c1e211acc1f06e0384e44bd1edac24.tar.gz | |
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
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 698536a61c7..c1c0969672c 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -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"; } |