diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-04-07 16:10:27 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-04-07 16:10:27 +0500 |
| commit | b9b15d52393f9aa33fbb6a6fdc40c8df75aadb81 (patch) | |
| tree | d46595aeafebe373e34fab33628294f37eef348d /sql/sql_class.h | |
| parent | 65ae25d092fe138ab0d0f9039a3ef8bc610b5031 (diff) | |
| download | mariadb-git-b9b15d52393f9aa33fbb6a6fdc40c8df75aadb81.tar.gz | |
sys_var_collation is now abstract class
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 9a853fc5736..1d4dafb997e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -380,7 +380,8 @@ struct system_variables my_bool new_mode; my_bool convert_result_charset; - CHARSET_INFO *thd_charset; + CHARSET_INFO *client_collation; + CHARSET_INFO *literal_collation; }; void free_tmp_table(THD *thd, TABLE *entry); @@ -661,9 +662,9 @@ public: net.report_error= 1; DBUG_PRINT("error",("Fatal error set")); } - inline CHARSET_INFO *charset() { return variables.thd_charset; } + inline CHARSET_INFO *charset() { return variables.client_collation; } inline CHARSET_INFO *result_charset(CHARSET_INFO *cs) - { return variables.convert_result_charset ? variables.thd_charset : cs; } + { return variables.convert_result_charset ? charset() : cs; } }; /* |