summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-04-07 16:20:46 +0200
committerserg@serg.mylan <>2004-04-07 16:20:46 +0200
commit6ebf869b40a096c1d6a6ccdd42364c0ad4a20bc7 (patch)
tree8e3d0724200afbcae1e7e7b321b2e166b4f4cd39 /sql/protocol.cc
parent61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff)
parent6fc74e13e7c175acecca86692ae4ce4209de203f (diff)
downloadmariadb-git-6ebf869b40a096c1d6a6ccdd42364c0ad4a20bc7.tar.gz
merged
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r--sql/protocol.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc
index fb4d2a57ab6..a5944af829d 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -825,7 +825,7 @@ bool Protocol_simple::store(Field *field)
String str(buff,sizeof(buff), &my_charset_bin);
CHARSET_INFO *tocs= this->thd->variables.character_set_results;
- field->val_str(&str,&str);
+ field->val_str(&str);
if (tocs && !my_charset_same(field->charset(), tocs) &&
(field->charset() != &my_charset_bin) &&
(tocs != &my_charset_bin))