diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-04-08 14:38:17 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-04-08 14:38:17 +0500 |
| commit | 8c95b516254b3af107dc8d8407f864ebcce79ee5 (patch) | |
| tree | 61ea115f17b75a76465238e1d7d684f336c0f646 /sql/protocol.cc | |
| parent | f20835c7aa678dfb043d683346bec920ce8895d9 (diff) | |
| download | mariadb-git-8c95b516254b3af107dc8d8407f864ebcce79ee5.tar.gz | |
Use of CHARSWT_INFO *result_collation
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 195fec80ed0..99b815a7840 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -724,7 +724,7 @@ bool Protocol_simple::store(const char *from, uint length, bool Protocol_simple::store(const char *from, uint length, CHARSET_INFO *fromcs) { - CHARSET_INFO *tocs= this->thd->result_charset(fromcs); + CHARSET_INFO *tocs= this->thd->variables.result_collation; #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || field_types[field_pos] == MYSQL_TYPE_DECIMAL || @@ -834,8 +834,7 @@ bool Protocol_simple::store(Field *field) field->val_str(&str,&str); if (!my_charset_same(field->charset(), this->thd->charset()) && (field->charset() != &my_charset_bin) && - (this->thd->charset() != &my_charset_bin) && - (this->thd->variables.convert_result_charset)) + (this->thd->charset() != &my_charset_bin)) { convert.copy(str.ptr(), str.length(), str.charset(), this->thd->charset()); return net_store_data(convert.ptr(), convert.length()); |