database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

sys_var_collation is now abstract class

Browse Source 
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
This commit is contained in:
bar@bar.mysql.r18.ru
2003-04-07 16:10:27 +05:00
parent e0caf3f225
commit e165845d39
11 changed files with 113 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.h
View File

@ -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; }
};
/*