diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
| commit | 0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb (patch) | |
| tree | 7e682617fcbdab399d2eafccb6a4800dfdc71e51 /sql/sp_head.cc | |
| parent | 97ae1682f185be05276b172919e47fd86e9fd953 (diff) | |
| parent | df905524b218de07dddf5fa394af96edcc4ca483 (diff) | |
| download | mariadb-git-0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb.tar.gz | |
merge with mysql-5.1.63
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 932d0d052e8..473baa9ab9b 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('\''); |