diff options
| author | bar@bar.mysql.r18.ru <> | 2003-04-23 18:19:22 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-04-23 18:19:22 +0500 |
| commit | 6d5f527afd41e48499babe648b7c69ef0bef038d (patch) | |
| tree | 563e2fced4c06e8728790984dd7f333b818047c7 /sql/sql_class.h | |
| parent | 8379f5c4f9e5003b6459d3b8cde7844f183ad697 (diff) | |
| download | mariadb-git-6d5f527afd41e48499babe648b7c69ef0bef038d.tar.gz | |
Variable names have been renamed:
client_collation -> collation_client
result_collation -> collation_results
connection_collation -> collation_connection
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 58f27bf2bcb..d3cb843ad85 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -382,9 +382,9 @@ struct system_variables my_bool low_priority_updates; my_bool new_mode; - CHARSET_INFO *client_collation; - CHARSET_INFO *connection_collation; - CHARSET_INFO *result_collation; + CHARSET_INFO *collation_client; + CHARSET_INFO *collation_connection; + CHARSET_INFO *collation_results; }; void free_tmp_table(THD *thd, TABLE *entry); @@ -665,7 +665,7 @@ public: net.report_error= 1; DBUG_PRINT("error",("Fatal error set")); } - inline CHARSET_INFO *charset() { return variables.client_collation; } + inline CHARSET_INFO *charset() { return variables.collation_client; } }; /* |