summaryrefslogtreecommitdiff
path: root/sql/sql_analyse.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-11-06 15:49:53 +0400
committerunknown <bar@bar.mysql.r18.ru>2002-11-06 15:49:53 +0400
commitb0b72e4d52d525b82f9649cc7d57d647950ec59b (patch)
tree327d33408ca6f413ce8f595905d090403c11124b /sql/sql_analyse.cc
parent1e63509dfc5828fbd2180d3bc2bbeae0a32e42ee (diff)
downloadmariadb-git-b0b72e4d52d525b82f9649cc7d57d647950ec59b.tar.gz
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.
Diffstat (limited to 'sql/sql_analyse.cc')
-rw-r--r--sql/sql_analyse.cc4
1 files changed, 2 insertions, 2 deletions
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;