diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
| commit | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (patch) | |
| tree | 0180226f5648752d1d5bc2b7dd23e7cecf3253b1 /sql/sp_head.cc | |
| parent | 5a47413934a0ba0aeb91224f1010bb70bd9b1e8a (diff) | |
| parent | 57f824b0990b0a8708665a4a9ede245ce6064539 (diff) | |
| download | mariadb-git-280fcf08085e43b5359ec79c0e34166e51b3ebd8.tar.gz | |
5.1 merge
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 e36f5f4f1d5..9b06b3cb1b1 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('\''); |