diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-04-23 18:19:22 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-04-23 18:19:22 +0500 |
| commit | bb12690ad7db28b2c7a85b4b943df4d4174418c4 (patch) | |
| tree | 563e2fced4c06e8728790984dd7f333b818047c7 /sql/protocol.cc | |
| parent | fbf47d52345c33add48702e43fe2f87cc9fcfecb (diff) | |
| download | mariadb-git-bb12690ad7db28b2c7a85b4b943df4d4174418c4.tar.gz | |
Variable names have been renamed:
client_collation -> collation_client
result_collation -> collation_results
connection_collation -> collation_connection
BitKeeper/etc/ignore:
Added client/ssl_test to the ignore list
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 99b815a7840..d00ecb5dbc4 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->variables.result_collation; + CHARSET_INFO *tocs= this->thd->variables.collation_results; #ifndef DEBUG_OFF DBUG_ASSERT(field_types == 0 || field_types[field_pos] == MYSQL_TYPE_DECIMAL || |