diff options
| author | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-02-29 14:15:15 +0530 |
|---|---|---|
| committer | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-02-29 14:15:15 +0530 |
| commit | a0238152c7cc44b24d7ceb17755a5e24bd8b511a (patch) | |
| tree | ffb1240e5cdf7d9be7936eb35ef77d4645b6297f /sql/sp_head.cc | |
| parent | be866add0622db4258a0659c1e01ea7ae2fb5445 (diff) | |
| parent | 9af695fb4587a6e53241d05635caaaa113ac95d8 (diff) | |
| download | mariadb-git-a0238152c7cc44b24d7ceb17755a5e24bd8b511a.tar.gz | |
Merge from 5.1 to 5.5
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 eb29590b700..0c228d19f4d 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -169,7 +169,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('\''); |