diff options
author | Ramil Kalimullin <ramil@mysql.com> | 2008-10-02 10:56:07 +0500 |
---|---|---|
committer | Ramil Kalimullin <ramil@mysql.com> | 2008-10-02 10:56:07 +0500 |
commit | 7fd877ea8d7ebb848f0677f1a46c9236020a541b (patch) | |
tree | e274302a462958e8698e43a2a1c90f8fc43e5828 /sql/sp_head.cc | |
parent | 65704e3d83b50135439c55bc00cd20578609d46e (diff) | |
parent | 29cc9af59aed6f88a994ca01eac57810aef9b461 (diff) | |
download | mariadb-git-7fd877ea8d7ebb848f0677f1a46c9236020a541b.tar.gz |
Merge
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r-- | sql/sp_head.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index cf6610dfa11..a0eda42f0c5 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -126,6 +126,9 @@ sp_get_item_value(THD *thd, Item *item, String *str) if (cs->escape_with_backslash_is_dangerous) buf.append(' '); append_query_string(cs, result, &buf); + buf.append(" COLLATE '"); + buf.append(item->collation.collation->name); + buf.append('\''); str->copy(buf); return str; |