summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-08-12 18:13:42 +0500
committerunknown <bar@mysql.com>2005-08-12 18:13:42 +0500
commit84b347412122bcd2f177a3b55a40a091f379b61c (patch)
tree5a1957727c87bb69439bcf3c00b5e61f497ff23c /sql/item_strfunc.cc
parent8685497a3f2467fb3929d633d5104782142c5362 (diff)
downloadmariadb-git-84b347412122bcd2f177a3b55a40a091f379b61c.tar.gz
item_strfunc.cc:
After merge change. 4.1 method was replaced in 5.0. sql/item_strfunc.cc: After merge change. 4.1 method was replaced in 5.0.
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 11c763ee173..094a0c56319 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1570,7 +1570,7 @@ Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs)
return NULL;
}
conv->str_value.copy();
- conv->str_value.shrink_to_length();
+ conv->str_value.mark_as_const();
return conv;
}