diff options
author | unknown <bar@mysql.com> | 2005-08-12 15:44:03 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2005-08-12 15:44:03 +0500 |
commit | 058d5bff6e73eb4b9b36cb0bb82687557e3c317d (patch) | |
tree | d8d0351d83f852b706b4081edfabb852a0522032 /sql/item_strfunc.cc | |
parent | d8ab9304989108eeef77e5331d62bfe2c0d9f8a8 (diff) | |
parent | d3a6f4082fa5c50881b4344a23d157f8c3c5009d (diff) | |
download | mariadb-git-058d5bff6e73eb4b9b36cb0bb82687557e3c317d.tar.gz |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b12351
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r-- | sql/item_strfunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index b7015b3d6ef..d0650a1ce11 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1562,6 +1562,7 @@ Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs) return NULL; } conv->str_value.copy(); + conv->str_value.shrink_to_length(); return conv; } |