diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 17:44:12 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 17:44:12 +0500 |
| commit | 4637832fa19b2866929c1e5cb7c9dd0a40db15c9 (patch) | |
| tree | c1d41d9ae86450c3c93a4424253c8553ffcec322 /sql/sql_class.h | |
| parent | 01add721927cf92ec3368cb56d685777aacbfe42 (diff) | |
| download | mariadb-git-4637832fa19b2866929c1e5cb7c9dd0a40db15c9.tar.gz | |
Some SHOW VARIABLES have been renamed:
collation_client -> character_set_client
collation_results -> character_set_results
character_set -> character_set_server
SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 36427eae43e..08043e7e626 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -385,9 +385,9 @@ struct system_variables my_bool low_priority_updates; my_bool new_mode; - CHARSET_INFO *collation_client; + CHARSET_INFO *character_set_client; + CHARSET_INFO *character_set_results; CHARSET_INFO *collation_connection; - CHARSET_INFO *collation_results; }; void free_tmp_table(THD *thd, TABLE *entry); @@ -670,7 +670,7 @@ public: net.report_error= 1; DBUG_PRINT("error",("Fatal error set")); } - inline CHARSET_INFO *charset() { return variables.collation_client; } + inline CHARSET_INFO *charset() { return variables.character_set_client; } }; /* |