database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

8
sql/sql_analyse.cc
View File

@ -901,14 +901,14 @@ int collect_real(double *element, element_count count __attribute__((unused)),
TREE_INFO *info)
{
char buff[MAX_FIELD_WIDTH];
String s(buff, sizeof(buff),current_thd->variables.thd_charset);
String s(buff, sizeof(buff),current_thd->charset());
if (info->found)
info->str->append(',');
else
info->found = 1;
info->str->append('\'');
s.set(*element, info->item->decimals, current_thd->variables.thd_charset);
s.set(*element, info->item->decimals, current_thd->charset());
info->str->append(s);
info->str->append('\'');
return 0;
@ -927,7 +927,7 @@ int collect_longlong(longlong *element,
else
info->found = 1;
info->str->append('\'');
s.set(*element, current_thd->variables.thd_charset);
s.set(*element, current_thd->charset());
info->str->append(s);
info->str->append('\'');
return 0;
@ -946,7 +946,7 @@ int collect_ulonglong(ulonglong *element,
else
info->found = 1;
info->str->append('\'');
s.set(*element, current_thd->variables.thd_charset);
s.set(*element, current_thd->charset());
info->str->append(s);
info->str->append('\'');
return 0;