diff options
| author | unknown <serg@serg.mylan> | 2004-04-07 16:20:46 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-07 16:20:46 +0200 |
| commit | b6f2a534fe9cfa4b67afa2ea8ad8c65f043d6302 (patch) | |
| tree | 8e3d0724200afbcae1e7e7b321b2e166b4f4cd39 /sql/protocol.cc | |
| parent | 0948f9769b3e3da2e064e65015b86644af4acd78 (diff) | |
| parent | 736853e501181c33e692653d00d7a84c6ff68f25 (diff) | |
| download | mariadb-git-b6f2a534fe9cfa4b67afa2ea8ad8c65f043d6302.tar.gz | |
merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 2 |
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)) |