From b0b72e4d52d525b82f9649cc7d57d647950ec59b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 6 Nov 2002 15:49:53 +0400 Subject: Item->thd_charset() - returns a default charset which should be used to compose strings appeared without charset context, for example, in convertion from numer into string type. --- sql/sql_analyse.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/sql_analyse.cc') diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index d1ecdd029d5..5c735ab35d5 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -896,14 +896,14 @@ int collect_real(double *element, element_count count __attribute__((unused)), TREE_INFO *info) { char buff[MAX_FIELD_WIDTH]; - String s(buff, sizeof(buff),default_charset_info); + String s(buff, sizeof(buff),current_thd->thd_charset); if (info->found) info->str->append(','); else info->found = 1; info->str->append('\''); - s.set(*element, info->item->decimals, my_thd_charset); + s.set(*element, info->item->decimals, current_thd->thd_charset); info->str->append(s); info->str->append('\''); return 0; -- cgit v1.2.1