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 | a0b46059ee30def733601a85d12e44855f4d10af (patch) | |
| tree | ffb1240e5cdf7d9be7936eb35ef77d4645b6297f /sql/item.cc | |
| parent | 9e048a6bc556f909613cca1fa9b9007ec3546092 (diff) | |
| parent | c22c9270fb40a8a2df988084968c0e04dd07a4b8 (diff) | |
| download | mariadb-git-a0b46059ee30def733601a85d12e44855f4d10af.tar.gz | |
Merge from 5.1 to 5.5
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index 54982d656c9..69821df986a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3291,7 +3291,7 @@ String *Item_param::val_str(String* str) that binary log contains wrong statement */ -const String *Item_param::query_val_str(String* str) const +const String *Item_param::query_val_str(THD *thd, String* str) const { switch (state) { case INT_VALUE: @@ -3329,7 +3329,8 @@ const String *Item_param::query_val_str(String* str) const case LONG_DATA_VALUE: { str->length(0); - append_query_string(value.cs_info.character_set_client, &str_value, str); + append_query_string(thd, value.cs_info.character_set_client, &str_value, + str); break; } case NULL_VALUE: @@ -3462,7 +3463,7 @@ void Item_param::print(String *str, enum_query_type query_type) char buffer[STRING_BUFFER_USUAL_SIZE]; String tmp(buffer, sizeof(buffer), &my_charset_bin); const String *res; - res= query_val_str(&tmp); + res= query_val_str(current_thd, &tmp); str->append(*res); } } |