diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-03-08 17:16:53 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-03-08 17:16:53 +0200 |
| commit | 4b5306fd6eff1a04efdacf2d13ffcb1dd61238a4 (patch) | |
| tree | 4bbe43dd74715c56302429c8ac587047633cbb58 /sql/sp_head.cc | |
| parent | b15a8bf8a7ec9d1181cf813a2662a0777dbcea89 (diff) | |
| parent | c5511bdf0888974cc9a68474702e10163a2763c1 (diff) | |
| download | mariadb-git-4b5306fd6eff1a04efdacf2d13ffcb1dd61238a4.tar.gz | |
merge mysql-5.1->mysql-5.1-security
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index dec76615ec7..7eef9f5ab28 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -157,7 +157,7 @@ sp_get_item_value(THD *thd, Item *item, String *str) buf.append(result->charset()->csname); if (cs->escape_with_backslash_is_dangerous) buf.append(' '); - append_query_string(cs, result, &buf); + append_query_string(thd, cs, result, &buf); buf.append(" COLLATE '"); buf.append(item->collation.collation->name); buf.append('\''); |