diff options
| author | unknown <bar@mysql.com> | 2005-08-12 17:10:00 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-08-12 17:10:00 +0500 |
| commit | 8685497a3f2467fb3929d633d5104782142c5362 (patch) | |
| tree | 837691783e69d447d573b714d65381b20a31dd69 /sql/item_strfunc.cc | |
| parent | 36283ca2f09569fa1f1c7aabfcce4a188a17ad60 (diff) | |
| parent | 058d5bff6e73eb4b9b36cb0bb82687557e3c317d (diff) | |
| download | mariadb-git-8685497a3f2467fb3929d633d5104782142c5362.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
into mysql.com:/usr/home/bar/mysql-5.0
client/mysqlcheck.c:
Auto merged
mysql-test/r/func_system.result:
Auto merged
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 39e74acb2e9..11c763ee173 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1570,6 +1570,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; } |